The sleeper does not offer that chemical!")
return
- if(src.occupant)
- if(src.occupant.reagents)
- if(src.occupant.reagents.get_reagent_amount(chemical) + amount <= max_chem)
- src.occupant.reagents.add_reagent(chemical, amount)
+ if(occupant)
+ if(occupant.reagents)
+ if(occupant.reagents.get_reagent_amount(chemical) + amount <= max_chem)
+ occupant.reagents.add_reagent(chemical, amount)
return
else
to_chat(user, "You can not inject any more of this chemical.")
@@ -446,8 +446,8 @@
if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other
return
- src.icon_state = "[base_icon]-open"
- src.go_out()
+ icon_state = "[base_icon]-open"
+ go_out()
add_fingerprint(usr)
return
@@ -505,15 +505,15 @@
visible_message("[user] starts putting [L.name] into the sleeper.")
if(do_after(user, 20, target = L))
- if(src.occupant)
+ if(occupant)
to_chat(user, "The sleeper is already occupied!")
return
if(!L) return
L.forceMove(src)
- src.occupant = L
- src.icon_state = "[base_icon]"
+ occupant = L
+ icon_state = "[base_icon]"
to_chat(L, "You feel cool air surround you. You go numb as your senses turn inward.")
- src.add_fingerprint(user)
+ add_fingerprint(user)
if(user.pulling == L)
user.stop_pulling()
return
@@ -528,7 +528,7 @@
set src in oview(1)
if(usr.stat != 0 || !(ishuman(usr)))
return
- if(src.occupant)
+ if(occupant)
to_chat(usr, "The sleeper is already occupied!")
return
if(panel_open)
@@ -542,17 +542,17 @@
return
visible_message("[usr] starts climbing into the sleeper.")
if(do_after(usr, 20, target = usr))
- if(src.occupant)
+ if(occupant)
to_chat(usr, "The sleeper is already occupied!")
return
usr.stop_pulling()
usr.forceMove(src)
- src.occupant = usr
- src.icon_state = "[base_icon]"
+ occupant = usr
+ icon_state = "[base_icon]"
for(var/obj/O in src)
qdel(O)
- src.add_fingerprint(usr)
+ add_fingerprint(usr)
return
return
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 040fd848cfd..2566cc0f410 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -2,9 +2,9 @@
name = "body scanner"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "bodyscanner-open"
- density = 1
- dir = 8
- anchored = 1
+ density = TRUE
+ dir = WEST
+ anchored = TRUE
idle_power_usage = 1250
active_power_usage = 2500
@@ -32,7 +32,7 @@
if(M == occupant)
continue
else
- M.forceMove(src.loc)
+ M.forceMove(loc)
/obj/machinery/bodyscanner/New()
..()
@@ -54,37 +54,36 @@
component_parts += new /obj/item/stack/cable_coil(null, 2)
RefreshParts()
-/obj/machinery/bodyscanner/attackby(var/obj/item/G as obj, var/mob/user as mob)
- if(istype(G, /obj/item/screwdriver))
- if(src.occupant)
+/obj/machinery/bodyscanner/attackby(obj/item/I, mob/user)
+ if(isscrewdriver(I))
+ if(occupant)
to_chat(user, "The maintenance panel is locked.")
return
- default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", G)
+ default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", I)
return
- if(istype(G, /obj/item/wrench))
- if(src.occupant)
+ if(iswrench(I))
+ if(occupant)
to_chat(user, "The scanner is occupied.")
return
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
- if(dir == 4)
- dir = 8
+ if(dir == EAST)
+ setDir(WEST)
else
- dir = 4
- playsound(src.loc, G.usesound, 50, 1)
+ setDir(EAST)
+ playsound(loc, I.usesound, 50, 1)
return
- if(exchange_parts(user, G))
+ if(exchange_parts(user, I))
return
- if(istype(G, /obj/item/crowbar))
- default_deconstruction_crowbar(G)
+ if(default_deconstruction_crowbar(I))
return
- if(istype(G, /obj/item/grab))
- var/obj/item/grab/TYPECAST_YOUR_SHIT = G
+ if(istype(I, /obj/item/grab))
+ var/obj/item/grab/TYPECAST_YOUR_SHIT = I
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
@@ -105,7 +104,10 @@
occupant = M
icon_state = "body_scanner_1"
add_fingerprint(user)
- qdel(G)
+ qdel(TYPECAST_YOUR_SHIT)
+ return
+
+ return ..()
/obj/machinery/bodyscanner/MouseDrop_T(mob/living/carbon/human/O, mob/user as mob)
@@ -123,7 +125,7 @@
to_chat(user, "Close the maintenance panel first.")
return 0 //panel open
if(occupant)
- to_chat(user, "\The [src] is already occupied.")
+ to_chat(user, "[src] is already occupied.")
return 0 //occupied
if(O.buckled)
@@ -137,7 +139,7 @@
return 0
if(O == user)
- visible_message("[user] climbs into \the [src].")
+ visible_message("[user] climbs into [src].")
else
visible_message("[user] puts [O] into the body scanner.")
@@ -175,21 +177,21 @@
switch(severity)
if(1.0)
for(var/atom/movable/A as mob|obj in src)
- A.forceMove(src.loc)
+ A.forceMove(loc)
A.ex_act(severity)
qdel(src)
return
if(2.0)
if(prob(50))
for(var/atom/movable/A as mob|obj in src)
- A.forceMove(src.loc)
+ A.forceMove(loc)
A.ex_act(severity)
qdel(src)
return
if(3.0)
if(prob(25))
for(var/atom/movable/A as mob|obj in src)
- A.forceMove(src.loc)
+ A.forceMove(loc)
A.ex_act(severity)
qdel(src)
return
@@ -220,7 +222,7 @@
icon_state = "bodyscannerconsole"
density = 1
anchored = 1
- dir = 8
+ dir = WEST
idle_power_usage = 250
active_power_usage = 500
var/obj/machinery/bodyscanner/connected = null
@@ -238,7 +240,7 @@
stat &= ~NOPOWER
else
spawn(rand(0, 15))
- src.icon_state = "bodyscannerconsole-p"
+ icon_state = "bodyscannerconsole-p"
stat |= NOPOWER
/obj/machinery/body_scanconsole/New()
@@ -292,33 +294,35 @@
break
-/obj/machinery/body_scanconsole/attackby(var/obj/item/G as obj, var/mob/user as mob, params)
- if(istype(G, /obj/item/screwdriver))
- default_deconstruction_screwdriver(user, "bodyscannerconsole-p", "bodyscannerconsole", G)
+/obj/machinery/body_scanconsole/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "bodyscannerconsole-p", "bodyscannerconsole", I))
return
- if(istype(G, /obj/item/wrench))
+ if(iswrench(I))
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
- if(dir == 4)
- dir = 8
+ if(dir == EAST)
+ setDir(WEST)
else
- dir = 4
- playsound(loc, G.usesound, 50, 1)
+ setDir(EAST)
+ playsound(loc, I.usesound, 50, 1)
- if(exchange_parts(user, G))
+ if(exchange_parts(user, I))
return
- default_deconstruction_crowbar(G)
+ if(default_deconstruction_crowbar(I))
+ return
+ else
+ return ..()
-/obj/machinery/body_scanconsole/attack_ai(user as mob)
+/obj/machinery/body_scanconsole/attack_ai(user)
return attack_hand(user)
-/obj/machinery/body_scanconsole/attack_ghost(user as mob)
+/obj/machinery/body_scanconsole/attack_ghost(user)
return attack_hand(user)
-/obj/machinery/body_scanconsole/attack_hand(user as mob)
+/obj/machinery/body_scanconsole/attack_hand(user)
if(stat & (NOPOWER|BROKEN))
return
@@ -326,13 +330,13 @@
to_chat(user, "Close the maintenance panel first.")
return
- if(!src.connected)
+ if(!connected)
findscanner()
ui_interact(user)
-/obj/machinery/body_scanconsole/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/body_scanconsole/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "adv_med.tmpl", "Body Scanner", 690, 600)
@@ -383,7 +387,7 @@
var/bloodData[0]
bloodData["hasBlood"] = 0
- if(ishuman(H) && !(NO_BLOOD in H.species.species_traits))
+ if(ishuman(H) && !(NO_BLOOD in H.dna.species.species_traits))
bloodData["hasBlood"] = 1
bloodData["volume"] = H.blood_volume
bloodData["percent"] = round(((H.blood_volume / BLOOD_VOLUME_NORMAL)*100))
@@ -475,14 +479,14 @@
return 1
if(href_list["ejectify"])
- src.connected.eject()
+ connected.eject()
if(href_list["print_p"])
generate_printing_text()
if(!(printing) && printing_text)
printing = 1
- visible_message("\The [src] rattles and prints out a sheet of paper.")
+ visible_message("[src] rattles and prints out a sheet of paper.")
var/obj/item/paper/P = new /obj/item/paper(loc)
playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
P.info = "Body Scan - [href_list["name"]]
"
@@ -654,7 +658,7 @@
if(occupant.disabilities & NEARSIGHTED)
dat += "Retinal misalignment detected.
"
else
- dat += "\The [src] is empty."
+ dat += "[src] is empty."
else
dat = " Error: No Body Scanner connected."
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index f24197009bd..de32918c068 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -973,31 +973,30 @@
playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1)
return
-/obj/machinery/alarm/attackby(obj/item/W as obj, mob/user as mob, params)
- src.add_fingerprint(user)
+/obj/machinery/alarm/attackby(obj/item/I, mob/user, params)
+ add_fingerprint(user)
switch(buildstage)
if(2)
- if(istype(W, /obj/item/screwdriver)) // Opening that Air Alarm up.
-// to_chat(user, "You pop the Air Alarm's maintence panel open.")
+ if(isscrewdriver(I)) // Opening that Air Alarm up.
wiresexposed = !wiresexposed
to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]")
update_icon()
return
- if(istype(W, /obj/item/wirecutters)) // cutting the wires out
+ if(iswirecutter(I)) // cutting the wires out
if(wires.wires_status == 31) // all wires cut
var/obj/item/stack/cable_coil/new_coil = new /obj/item/stack/cable_coil()
new_coil.amount = 5
- new_coil.loc = user.loc
+ new_coil.forceMove(user.loc)
buildstage = 1
update_icon()
- return
+ return
- if(wiresexposed && ((istype(W, /obj/item/multitool) || istype(W, /obj/item/wirecutters))))
+ if(wiresexposed && ((ismultitool(I) || iswirecutter(I))))
return attack_hand(user)
- if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda))// trying to unlock the interface with an ID card
+ if(istype(I, /obj/item/card/id) || istype(I, /obj/item/pda))// trying to unlock the interface with an ID card
if(stat & (NOPOWER|BROKEN))
to_chat(user, "It does nothing")
return
@@ -1008,13 +1007,11 @@
updateUsrDialog()
else
to_chat(user, "Access denied.")
-
-
- return
+ return
if(1)
- if(istype(W, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/coil = W
+ if(istype(I, /obj/item/stack/cable_coil))
+ var/obj/item/stack/cable_coil/coil = I
if(coil.amount < 5)
to_chat(user, "You need more cable for this!")
return
@@ -1030,34 +1027,35 @@
first_run()
return
- else if(istype(W, /obj/item/crowbar))
+ else if(iscrowbar(I))
to_chat(user, "You start prying out the circuit.")
- playsound(get_turf(src), W.usesound, 50, 1)
- if(do_after(user, 20 * W.toolspeed, target = src))
+ playsound(get_turf(src), I.usesound, 50, 1)
+ if(do_after(user, 20 * I.toolspeed, target = src))
if(buildstage != 1)
return
to_chat(user, "You pry out the circuit!")
var/obj/item/airalarm_electronics/circuit = new /obj/item/airalarm_electronics()
- circuit.loc = user.loc
+ circuit.forceMove(user.loc)
buildstage = 0
update_icon()
return
if(0)
- if(istype(W, /obj/item/airalarm_electronics))
+ if(istype(I, /obj/item/airalarm_electronics))
to_chat(user, "You insert the circuit!")
- playsound(get_turf(src), W.usesound, 50, 1)
- qdel(W)
+ playsound(get_turf(src), I.usesound, 50, 1)
+ qdel(I)
buildstage = 1
update_icon()
return
- else if(istype(W, /obj/item/wrench))
+ else if(iswrench(I))
to_chat(user, "You remove the fire alarm assembly from the wall!")
new /obj/item/mounted/frame/alarm_frame(get_turf(user))
- playsound(get_turf(src), W.usesound, 50, 1)
+ playsound(get_turf(src), I.usesound, 50, 1)
qdel(src)
+ return
- return 0
+ return ..()
/obj/machinery/alarm/power_change()
if(powered(power_channel))
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 0e9f261d73d..e555ee91ce8 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -6,15 +6,18 @@
use_power = 2
idle_power_usage = 5
active_power_usage = 10
- layer = 5
+ layer = WALL_OBJ_LAYER
+
armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0)
var/datum/wires/camera/wires = null // Wires datum
+ max_integrity = 100
+ integrity_failure = 50
var/list/network = list("SS13")
var/c_tag = null
var/c_tag_order = 999
var/status = 1
- anchored = 1
- var/start_active = 0 //If it ignores the random chance to start broken on round start
+ anchored = TRUE
+ var/start_active = FALSE //If it ignores the random chance to start broken on round start
var/invuln = null
var/obj/item/camera_bug/bug = null
var/obj/item/camera_assembly/assembly = null
@@ -24,17 +27,14 @@
var/view_range = 7
var/short_range = 2
- var/light_disabled = 0
- var/alarm_on = 0
- var/busy = 0
- var/emped = 0 //Number of consecutive EMP's on this camera
+ var/busy = FALSE
+ var/emped = FALSE //Number of consecutive EMP's on this camera
- var/toggle_message = 'sound/items/Wirecutter.ogg'
+ var/toggle_sound = 'sound/items/Wirecutter.ogg'
/obj/machinery/camera/New()
..()
wires = new(src)
-
assembly = new(src)
assembly.state = 4
assembly.anchored = 1
@@ -46,14 +46,14 @@
/obj/machinery/camera/Initialize()
..()
if(is_station_level(z) && prob(3) && !start_active)
- toggle_cam()
+ toggle_cam(null, FALSE)
wires.CutAll()
/obj/machinery/camera/Destroy()
- toggle_cam(null, 0) //kick anyone viewing out
+ toggle_cam(null, FALSE) //kick anyone viewing out
QDEL_NULL(assembly)
if(istype(bug))
- bug.bugged_cameras -= src.c_tag
+ bug.bugged_cameras -= c_tag
if(bug.current == src)
bug.current = null
bug = null
@@ -71,147 +71,124 @@
return
if(!isEmpProof())
if(prob(150/severity))
- icon_state = "[initial(icon_state)]emp"
+ update_icon()
var/list/previous_network = network
network = list()
cameranet.removeCamera(src)
stat |= EMPED
set_light(0)
emped = emped+1 //Increase the number of consecutive EMP's
+ update_icon()
var/thisemp = emped //Take note of which EMP this proc is for
spawn(900)
- if(loc) //qdel limbo
+ if(!QDELETED(src))
triggerCameraAlarm() //camera alarm triggers even if multiple EMPs are in effect.
if(emped == thisemp) //Only fix it if the camera hasn't been EMP'd again
network = previous_network
- icon_state = initial(icon_state)
stat &= ~EMPED
- cancelCameraAlarm()
+ update_icon()
if(can_use())
cameranet.addCamera(src)
emped = 0 //Resets the consecutive EMP count
spawn(100)
if(!QDELETED(src))
cancelCameraAlarm()
- for(var/mob/O in mob_list)
- if(O.client && O.client.eye == src)
- O.unset_machine()
- O.reset_perspective(null)
- to_chat(O, "The screen bursts into static.")
+ for(var/mob/M in player_list)
+ if(M.client && M.client.eye == src)
+ M.unset_machine()
+ M.reset_perspective(null)
+ to_chat(M, "The screen bursts into static.")
..()
-/obj/machinery/camera/tesla_act(var/power)//EMP proof upgrade also makes it tesla immune
+/obj/machinery/camera/tesla_act(power)//EMP proof upgrade also makes it tesla immune
if(isEmpProof())
return
..()
qdel(src)//to prevent bomb testing camera from exploding over and over forever
-/obj/machinery/camera/ex_act(severity, target)
- if(src.invuln)
+/obj/machinery/camera/ex_act(severity)
+ if(invuln)
return
- else
- ..()
- return
-
-/obj/machinery/camera/blob_act()
- qdel(src)
- return
-
-/obj/machinery/camera/attack_ghost(mob/user)
- if(panel_open)
- wires.Interact(user)
-
-/obj/machinery/camera/attack_alien(mob/living/carbon/alien/humanoid/user)
- if(!istype(user))
- return
- user.do_attack_animation(src)
- add_hiddenprint(user)
- status = 0
- visible_message("\The [user] slashes at [src]!")
- playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
- toggle_cam(user, 0)
-
+ ..()
/obj/machinery/camera/proc/setViewRange(num = 7)
- src.view_range = num
+ view_range = num
cameranet.updateVisibility(src, 0)
-/obj/machinery/camera/attackby(obj/item/W, mob/living/user as mob, params)
- var/msg = "You attach [W] into the assembly inner circuits."
+/obj/machinery/camera/attackby(obj/item/I, mob/living/user, params)
+ var/msg = "You attach [I] into the assembly inner circuits."
var/msg2 = "The camera already has that upgrade!"
// DECONSTRUCTION
- if(istype(W, /obj/item/screwdriver))
-// to_chat(user, "You start to [panel_open ? "close" : "open"] the camera's panel.")
- //if(toggle_panel(user)) // No delay because no one likes screwdrivers trying to be hip and have a duration cooldown
+ if(isscrewdriver(I))
panel_open = !panel_open
- user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!",
- "You screw the camera's panel [panel_open ? "open" : "closed"].")
- playsound(src.loc, W.usesound, 50, 1)
+ to_chat(user, "You screw the camera's panel [panel_open ? "open" : "closed"].")
+ playsound(loc, I.usesound, 50, 1)
- else if((istype(W, /obj/item/wirecutters) || istype(W, /obj/item/multitool)) && panel_open)
+ else if((iswirecutter(I) || ismultitool(I)) && panel_open)
wires.Interact(user)
- else if(istype(W, /obj/item/weldingtool) && wires.CanDeconstruct())
- if(weld(W, user))
- to_chat(user, "You unweld the camera leaving it as just a frame screwed to the wall.")
- if(!assembly)
- assembly = new()
- assembly.loc = src.loc
- assembly.state = 1
- assembly.dir = src.dir
- assembly.update_icon()
- assembly = null
- qdel(src)
+ else if(iswelder(I) && panel_open && wires.CanDeconstruct())
+ var/obj/item/weldingtool/WT = I
+ if(!WT.remove_fuel(0, user))
return
- else if(istype(W, /obj/item/analyzer) && panel_open) //XRay
- if(!user.unEquip(W))
- to_chat(user, "[W] is stuck!")
+ to_chat(user, "You start to weld [src]...")
+ playsound(loc, WT.usesound, 50, 1)
+ if(do_after(user, 100 * WT.toolspeed, target = src))
+ user.visible_message("[user] unwelds [src], leaving it as just a frame bolted to the wall.",
+ "You unweld [src], leaving it as just a frame bolted to the wall")
+ deconstruct(TRUE)
+
+ else if(istype(I, /obj/item/analyzer) && panel_open) //XRay
+ if(!user.drop_item())
+ to_chat(user, "[I] is stuck to your hand!")
return
if(!isXRay())
upgradeXRay()
- qdel(W)
+ qdel(I)
to_chat(user, "[msg]")
else
to_chat(user, "[msg2]")
- else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open)
- if(!user.unEquip(W))
- to_chat(user, "[W] is stuck!")
+ else if(istype(I, /obj/item/stack/sheet/mineral/plasma) && panel_open)
+ if(!user.drop_item())
+ to_chat(user, "[I] is stuck to your hand!")
return
if(!isEmpProof())
+ var/obj/item/stack/sheet/mineral/plasma/P = I
upgradeEmpProof()
to_chat(user, "[msg]")
- qdel(W)
+ P.use(1)
else
to_chat(user, "[msg2]")
- else if(istype(W, /obj/item/assembly/prox_sensor) && panel_open)
- if(!user.unEquip(W))
+ else if(istype(I, /obj/item/assembly/prox_sensor) && panel_open)
+ if(!user.drop_item())
+ to_chat(user, "[I] is stuck to your hand!")
return
if(!isMotion())
upgradeMotion()
to_chat(user, "[msg]")
- qdel(W)
+ qdel(I)
else
to_chat(user, "[msg2]")
// OTHER
- else if((istype(W, /obj/item/paper) || istype(W, /obj/item/pda)) && isliving(user))
+ else if((istype(I, /obj/item/paper) || istype(I, /obj/item/pda)) && isliving(user))
var/mob/living/U = user
var/obj/item/paper/X = null
- var/obj/item/pda/P = null
+ var/obj/item/pda/PDA = null
var/itemname = ""
var/info = ""
- if(istype(W, /obj/item/paper))
- X = W
+ if(istype(I, /obj/item/paper))
+ X = I
itemname = X.name
info = X.info
else
- P = W
- var/datum/data/pda/app/notekeeper/N = P.find_program(/datum/data/pda/app/notekeeper)
+ PDA = I
+ var/datum/data/pda/app/notekeeper/N = PDA.find_program(/datum/data/pda/app/notekeeper)
if(N)
- itemname = P.name
+ itemname = PDA.name
info = N.notehtml
to_chat(U, "You hold \the [itemname] up to the camera ...")
U.changeNext_move(CLICK_CD_MELEE)
@@ -229,37 +206,59 @@
to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
O << browse(text("[][]", itemname, info), text("window=[]", itemname))
- else if(istype(W, /obj/item/camera_bug))
- if(!src.can_use())
+ else if(istype(I, /obj/item/camera_bug))
+ if(!can_use())
to_chat(user, "Camera non-functional.")
return
- if(istype(src.bug))
+ if(istype(bug))
to_chat(user, "Camera bug removed.")
- src.bug.bugged_cameras -= src.c_tag
- src.bug = null
+ bug.bugged_cameras -= c_tag
+ bug = null
else
to_chat(user, "Camera bugged.")
- src.bug = W
- src.bug.bugged_cameras[src.c_tag] = src
+ bug = I
+ bug.bugged_cameras[c_tag] = src
- else if(istype(W, /obj/item/melee/energy/blade))//Putting it here last since it's a special case. I wonder if there is a better way to do these than type casting.
- toggle_cam(user, 1)
- var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
- spark_system.set_up(5, 0, loc)
- spark_system.start()
- playsound(loc, W.usesound, 50, 1)
- playsound(loc, "sparks", 50, 1)
- visible_message("[user] has sliced the camera apart with an energy blade!")
- qdel(src)
-
- else if(istype(W, /obj/item/laser_pointer))
- var/obj/item/laser_pointer/L = W
+ else if(istype(I, /obj/item/laser_pointer))
+ var/obj/item/laser_pointer/L = I
L.laser_act(src, user)
else
- ..()
- return
+ return ..()
-/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = 1)
+/obj/machinery/camera/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
+ if(damage_flag == "melee" && damage_amount < 12 && !(stat & BROKEN))
+ return 0
+ . = ..()
+
+/obj/machinery/camera/obj_break(damage_flag)
+ if(status)
+ triggerCameraAlarm()
+ toggle_cam(null, FALSE)
+ wires.CutAll()
+
+/obj/machinery/camera/deconstruct(disassembled = TRUE)
+ if(disassembled)
+ if(!assembly)
+ assembly = new()
+ assembly.forceMove(loc)
+ assembly.state = 1
+ assembly.setDir(dir)
+ assembly.update_icon()
+ assembly = null
+ else
+ new /obj/item/camera_assembly(loc)
+ new /obj/item/stack/cable_coil(loc, 2)
+ qdel(src)
+
+/obj/machinery/camera/update_icon()
+ if(!status)
+ icon_state = "[initial(icon_state)]1"
+ else if(stat & EMPED)
+ icon_state = "[initial(icon_state)]emp"
+ else
+ icon_state = "[initial(icon_state)]"
+
+/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE)
status = !status
if(can_use())
cameranet.addCamera(src)
@@ -268,10 +267,7 @@
cameranet.removeCamera(src)
cameranet.updateChunk(x, y, z)
var/change_msg = "deactivates"
- if(!status)
- icon_state = "[initial(icon_state)]1"
- else
- icon_state = initial(icon_state)
+ if(status)
change_msg = "reactivates"
triggerCameraAlarm()
spawn(100)
@@ -284,7 +280,8 @@
else
visible_message("\The [src] [change_msg]!")
- playsound(src.loc, toggle_message, 100, 1)
+ playsound(loc, toggle_sound, 100, 1)
+ update_icon()
// now disconnect anyone using the camera
//Apparently, this will disconnect anyone even if the camera was re-activated.
@@ -295,16 +292,11 @@
O.reset_perspective(null)
to_chat(O, "The screen bursts into static.")
-/obj/machinery/camera/proc/triggerCameraAlarm(var/duration = 0)
- alarm_on = 1
- motion_alarm.triggerAlarm(loc, src)
+/obj/machinery/camera/proc/triggerCameraAlarm()
+ camera_alarm.triggerAlarm(loc, src)
/obj/machinery/camera/proc/cancelCameraAlarm()
- if(wires.IsIndexCut(CAMERA_WIRE_ALARM))
- return
-
- alarm_on = 0
- motion_alarm.clearAlarm(loc, src)
+ camera_alarm.clearAlarm(loc, src)
/obj/machinery/camera/proc/can_use()
if(!status)
@@ -331,25 +323,25 @@
//If someone knows a better way to do this, let me know. -Giacom
switch(i)
if(NORTH)
- src.dir = SOUTH
+ setDir(SOUTH)
if(SOUTH)
- src.dir = NORTH
+ setDir(NORTH)
if(WEST)
- src.dir = EAST
+ setDir(EAST)
if(EAST)
- src.dir = WEST
+ setDir(WEST)
break
//Return a working camera that can see a given mob
//or null if none
-/proc/seen_by_camera(var/mob/M)
+/proc/seen_by_camera(mob/M)
for(var/obj/machinery/camera/C in oview(4, M))
if(C.can_use()) // check if camera disabled
return C
break
return null
-/proc/near_range_camera(var/mob/M)
+/proc/near_range_camera(mob/M)
for(var/obj/machinery/camera/C in range(4, M))
if(C.can_use()) // check if camera disabled
return C
@@ -357,32 +349,15 @@
return null
-/obj/machinery/camera/proc/weld(var/obj/item/weldingtool/WT, var/mob/user)
- if(busy)
- return 0
- if(!WT.remove_fuel(0, user))
- return 0
-
- to_chat(user, "You start to weld [src]...")
- playsound(src.loc, WT.usesound, 50, 1)
- busy = 1
- if(do_after(user, 100 * WT.toolspeed, target = src))
- busy = 0
- if(!WT.isOn())
- return 0
- return 1
- busy = 0
- return 0
-
-/obj/machinery/camera/proc/Togglelight(on=0)
+/obj/machinery/camera/proc/Togglelight(on = FALSE)
for(var/mob/living/silicon/ai/A in ai_list)
for(var/obj/machinery/camera/cam in A.lit_cameras)
if(cam == src)
return
if(on)
- src.set_light(AI_CAMERA_LUMINOSITY)
+ set_light(AI_CAMERA_LUMINOSITY)
else
- src.set_light(0)
+ set_light(0)
/obj/machinery/camera/proc/nano_structure()
var/cam[0]
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index dc5a0141b27..8baf02088bb 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -6,7 +6,8 @@
w_class = WEIGHT_CLASS_SMALL
anchored = 0
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()
@@ -24,13 +25,13 @@
QDEL_LIST(upgrades)
return ..()
-/obj/item/camera_assembly/attackby(obj/item/W, mob/living/user, params)
+/obj/item/camera_assembly/attackby(obj/item/I, mob/living/user, params)
switch(state)
if(0)
// State 0
- if(iswrench(W) && isturf(src.loc))
- playsound(src.loc, W.usesound, 50, 1)
+ if(iswrench(I) && isturf(loc))
+ playsound(loc, I.usesound, 50, 1)
to_chat(user, "You wrench the assembly into place.")
anchored = 1
state = 1
@@ -40,15 +41,15 @@
if(1)
// State 1
- if(iswelder(W))
- if(weld(W, user))
+ if(iswelder(I))
+ if(weld(I, user))
to_chat(user, "You weld the assembly securely into place.")
anchored = 1
state = 2
return
- else if(iswrench(W))
- playsound(src.loc, W.usesound, 50, 1)
+ else if(iswrench(I))
+ playsound(loc, I.usesound, 50, 1)
to_chat(user, "You unattach the assembly from it's place.")
anchored = 0
update_icon()
@@ -57,19 +58,18 @@
if(2)
// State 2
- if(iscoil(W))
- var/obj/item/stack/cable_coil/C = W
+ 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, W.usesound, 50, 1)
+ playsound(loc, I.usesound, 50, 1)
state = 3
else
to_chat(user, "You need 2 coils of wire to wire the assembly.")
return
- else if(iswelder(W))
-
- if(weld(W, user))
+ else if(iswelder(I))
+ if(weld(I, user))
to_chat(user, "You unweld the assembly from it's place.")
state = 1
anchored = 1
@@ -78,8 +78,8 @@
if(3)
// State 3
- if(isscrewdriver(W))
- playsound(src.loc, W.usesound, 50, 1)
+ 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)
@@ -96,8 +96,8 @@
input = strip_html(input(usr, "How would you like to name the camera?", "Set Camera Name", temptag))
state = 4
- var/obj/machinery/camera/C = new(src.loc)
- src.loc = C
+ var/obj/machinery/camera/C = new(loc)
+ loc = C
C.assembly = src
C.auto_turn()
@@ -119,35 +119,36 @@
break
return
- else if(iswirecutter(W))
+ else if(iswirecutter(I))
new/obj/item/stack/cable_coil(get_turf(src), 2)
- playsound(src.loc, W.usesound, 50, 1)
+ playsound(loc, I.usesound, 50, 1)
to_chat(user, "You cut the wires from the circuits.")
state = 2
return
// Upgrades!
- if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already.
- if(!user.unEquip(W))
- to_chat(user, "[W] is stuck!")
+ if(is_type_in_list(I, possible_upgrades) && !is_type_in_list(I, upgrades)) // Is a possible upgrade and isn't in the camera already.
+ if(!user.unEquip(I))
+ to_chat(user, "[I] is stuck!")
return
- to_chat(user, "You attach \the [W] into the assembly inner circuits.")
- upgrades += W
+ to_chat(user, "You attach [I] into the assembly inner circuits.")
+ upgrades += I
user.drop_item()
- W.loc = src
+ I.loc = src
return
// Taking out upgrades
- else if(iscrowbar(W) && upgrades.len)
+ 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.")
- playsound(src.loc, W.usesound, 50, 1)
+ playsound(loc, I.usesound, 50, 1)
U.loc = get_turf(src)
upgrades -= U
return
- ..()
+ else
+ return ..()
/obj/item/camera_assembly/update_icon()
if(anchored)
@@ -159,7 +160,7 @@
if(!anchored)
..()
-/obj/item/camera_assembly/proc/weld(var/obj/item/weldingtool/WT, var/mob/living/user)
+/obj/item/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/living/user)
if(busy)
return 0
@@ -167,7 +168,7 @@
return 0
to_chat(user, "You start to weld the [src]..")
- playsound(src.loc, WT.usesound, 50, 1)
+ playsound(loc, WT.usesound, 50, 1)
busy = 1
if(do_after(user, 20 * WT.toolspeed, target = src))
busy = 0
@@ -176,3 +177,7 @@
return 1
busy = 0
return 0
+
+/obj/item/camera_assembly/deconstruct(disassembled = TRUE)
+ new /obj/item/stack/sheet/metal(loc)
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 57ade18dab3..6b728f2a20b 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -36,8 +36,8 @@
if(charging)
to_chat(user, "Current charge: [round(charging.percent(), 1)]%")
-/obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/stock_parts/cell))
+/obj/machinery/cell_charger/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/stock_parts/cell))
if(stat & BROKEN)
to_chat(user, "[src] is broken!")
return
@@ -57,19 +57,19 @@
if(!user.drop_item())
return
- W.forceMove(src)
- charging = W
+ I.forceMove(src)
+ charging = I
user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.")
chargelevel = -1
updateicon()
- else if(iswrench(W))
+ else if(iswrench(I))
if(charging)
to_chat(user, "Remove the cell first!")
return
anchored = !anchored
to_chat(user, "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground")
- playsound(src.loc, W.usesound, 75, 1)
+ playsound(src.loc, I.usesound, 75, 1)
else
return ..()
diff --git a/code/game/machinery/chiller.dm b/code/game/machinery/chiller.dm
index f48d59593ca..d2f76a7c42a 100644
--- a/code/game/machinery/chiller.dm
+++ b/code/game/machinery/chiller.dm
@@ -68,8 +68,8 @@
user << browse(null, "window=aircond")
user.unset_machine()
else
- ..()
- return
+ return ..()
+
/obj/machinery/space_heater/air_conditioner/attack_hand(mob/user as mob)
src.add_fingerprint(user)
interact(user)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index ee53fdbce8b..798a01f2bda 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -231,7 +231,7 @@
R.dna = new /datum/dna()
var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
- H.set_species(R.dna.species)
+ H.set_species(R.dna.species.type)
occupant = H
if(!R.dna.real_name) //to prevent null names
@@ -349,19 +349,19 @@
use_power(200)
//Let's unlock this early I guess. Might be too early, needs tweaking.
-/obj/machinery/clonepod/attackby(obj/item/W, mob/user, params)
+/obj/machinery/clonepod/attackby(obj/item/I, mob/user, params)
if(!(occupant || mess))
- if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", W))
+ if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", I))
return
- if(exchange_parts(user, W))
+ if(exchange_parts(user, I))
return
- if(default_deconstruction_crowbar(W))
+ if(default_deconstruction_crowbar(I))
return
- if(W.GetID())
- if(!check_access(W))
+ if(I.GetID())
+ if(!check_access(I))
to_chat(user, "Access Denied.")
return
if(!(occupant || mess))
@@ -374,34 +374,33 @@
go_out()
//Removing cloning pod biomass
- else if(istype(W, /obj/item/reagent_containers/food/snacks/meat))
- to_chat(user, "\The [src] processes \the [W].")
- biomass += BIOMASS_MEAT_AMOUNT
- user.drop_item()
- qdel(W)
- return
- else if(istype(W, /obj/item/wrench))
+ else if(istype(I, /obj/item/reagent_containers/food/snacks/meat))
+ if(user.drop_item())
+ to_chat(user, "[src] processes [I].")
+ biomass += BIOMASS_MEAT_AMOUNT
+ qdel(I)
+ else if(iswrench(I))
if(occupant)
to_chat(user, "Can not do that while [src] is in use.")
else
if(anchored)
- anchored = 0
+ anchored = FALSE
connected.pods -= src
connected = null
else
- anchored = 1
- playsound(loc, W.usesound, 100, 1)
+ anchored = TRUE
+ playsound(loc, I.usesound, 100, 1)
if(anchored)
user.visible_message("[user] secures [src] to the floor.", "You secure [src] to the floor.")
else
user.visible_message("[user] unsecures [src] from the floor.", "You unsecure [src] from the floor.")
- else if(istype(W, /obj/item/multitool))
- var/obj/item/multitool/M = W
+ else if(ismultitool(I))
+ var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "You load connection data from [src] to [M].")
return
else
- ..()
+ return ..()
/obj/machinery/clonepod/emag_act(user)
if(isnull(occupant))
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 42061760d92..00bd309b21e 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -123,8 +123,8 @@
occupantData["maxTemp"] = 1000 // If you get a burning vox armalis into the sleeper, congratulations
// Because we can put simple_animals in here, we need to do something tricky to get things working nice
occupantData["temperatureSuitability"] = 0 // 0 is the baseline
- if(ishuman(occupant) && occupant.species)
- var/datum/species/sp = occupant.species
+ if(ishuman(occupant) && occupant.dna.species)
+ var/datum/species/sp = occupant.dna.species
if(occupant.bodytemperature < sp.cold_level_3)
occupantData["temperatureSuitability"] = -3
else if(occupant.bodytemperature < sp.cold_level_2)
@@ -147,7 +147,7 @@
occupantData["btCelsius"] = occupant.bodytemperature - T0C
occupantData["btFaren"] = ((occupant.bodytemperature - T0C) * (9.0/5.0))+ 32
- if(ishuman(occupant) && !(NO_BLOOD in occupant.species.species_traits))
+ if(ishuman(occupant) && !(NO_BLOOD in occupant.dna.species.species_traits))
occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
occupantData["hasBlood"] = 1
occupantData["bloodLevel"] = round(occupant.blood_volume)
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 2b3c338fa3d..67f1dba85f0 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -117,7 +117,7 @@
return
laws = M.laws
- if(istype(P, /obj/item/mmi) || istype(P, /obj/item/mmi/posibrain))
+ if(istype(P, /obj/item/mmi))
if(!P:brainmob)
to_chat(user, "Sticking an empty [P] into the frame would sort of defeat the purpose.")
return
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 00f6a98f2bc..99eaeae3fe6 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -31,6 +31,7 @@
for(var/V in actions)
var/datum/action/A = V
A.Remove(user)
+ actions.Cut()
if(user.client)
user.reset_perspective(null)
eyeobj.RemoveImages()
@@ -52,6 +53,7 @@
if(current_user)
current_user.unset_machine()
QDEL_NULL(eyeobj)
+ QDEL_LIST(actions)
return ..()
/obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 95aee7cb9fe..c134747cd41 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -356,15 +356,14 @@
return
if(scan_brain && !can_brainscan())
return
- if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (NO_SCAN in subject.species.species_traits))
+ if((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna) || (NO_SCAN in subject.dna.species.species_traits))
scantemp = "Error: Unable to locate valid genetic data."
SSnanoui.update_uis(src)
return
if(subject.get_int_organ(/obj/item/organ/internal/brain))
var/obj/item/organ/internal/brain/Brn = subject.get_int_organ(/obj/item/organ/internal/brain)
if(istype(Brn))
- var/datum/species/S = all_species[Brn.dna.species] // stepladder code wooooo
- if(NO_SCAN in S.species_traits)
+ if(NO_SCAN in Brn.dna.species.species_traits)
scantemp = "Error: Subject's brain is incompatible."
SSnanoui.update_uis(src)
return
@@ -402,10 +401,9 @@
var/obj/item/organ/B = subject.get_int_organ(/obj/item/organ/internal/brain)
B.dna.check_integrity()
R.dna=B.dna.Clone()
- var/datum/species/S = all_species[R.dna.species]
- if(NO_SCAN in S.species_traits)
+ if(NO_SCAN in R.dna.species.species_traits)
extra_info = "Proper genetic interface not found, defaulting to genetic data of the body."
- R.dna.species = subject.species.name
+ R.dna.species = new subject.dna.species.type
R.id= copytext(md5(B.dna.real_name), 2, 6)
R.name=B.dna.real_name
else
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 054d4d441a3..865f683946e 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -231,7 +231,7 @@
to_chat(usr, "Arrays recycling. Please stand by.")
SSnanoui.update_uis(src)
return
- var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") as text|null
+ var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","")
if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
SSnanoui.update_uis(src)
return
@@ -250,7 +250,7 @@
to_chat(usr, "Arrays recycling. Please stand by.")
SSnanoui.update_uis(src)
return
- var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null
+ var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
SSnanoui.update_uis(src)
return
@@ -270,7 +270,7 @@
to_chat(usr, "Arrays recycling. Please stand by.")
SSnanoui.update_uis(src)
return
- var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null
+ var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
SSnanoui.update_uis(src)
return
diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm
new file mode 100644
index 00000000000..6bd5eadc822
--- /dev/null
+++ b/code/game/machinery/computer/depot.dm
@@ -0,0 +1,519 @@
+
+#define DEPOT_VISITOR_START 1
+#define DEPOT_VISITOR_END 2
+#define DEPOT_VISITOR_ADD 3
+
+
+// Generic parent depot computer type
+
+/obj/machinery/computer/syndicate_depot
+ name = "depot computer"
+ icon = 'icons/obj/computer.dmi'
+ icon_keyboard = "syndie_key"
+ icon_screen = "tcboss"
+ light_color = LIGHT_COLOR_PURE_CYAN
+ req_access = list(access_syndicate)
+ var/security_lockout = FALSE
+ var/sound_yes = 'sound/machines/twobeep.ogg'
+ var/sound_no = 'sound/machines/buzz-sigh.ogg'
+ var/sound_click = 'sound/machines/click.ogg'
+ var/area/syndicate_depot/core/depotarea
+ var/alerts_when_broken = FALSE
+ var/has_alerted = FALSE
+
+
+/obj/machinery/computer/syndicate_depot/New()
+ . = ..()
+ depotarea = areaMaster
+
+/obj/machinery/computer/syndicate_depot/attack_ai(mob/user)
+ if(req_access.len && !("syndicate" in user.faction))
+ to_chat(user, "A firewall blocks your access.")
+ return 1
+ return ..()
+
+/obj/machinery/computer/syndicate_depot/emp_act(severity)
+ return
+
+/obj/machinery/computer/syndicate_depot/emag_act(mob/user)
+ to_chat(user, "The electronic systems in this console are far too advanced for your primitive hacking peripherals.")
+ return
+
+/obj/machinery/computer/syndicate_depot/allowed(mob/user)
+ if(user.can_advanced_admin_interact())
+ return 1
+ if(!isliving(user))
+ return 0
+ if(has_security_lockout(user))
+ return 0
+ return ..()
+
+/obj/machinery/computer/syndicate_depot/proc/has_security_lockout(mob/user)
+ if(security_lockout)
+ playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ to_chat(user, "[src] is under security lockout.")
+ return TRUE
+ return FALSE
+
+/obj/machinery/computer/syndicate_depot/proc/activate_security_lockout()
+ security_lockout = TRUE
+ disable_special_functions()
+
+/obj/machinery/computer/syndicate_depot/attack_hand(mob/user)
+ if(..())
+ return
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if(!allowed(user))
+ to_chat(user, "Access Denied.")
+ return
+ user.set_machine(src)
+ var/dat = get_menu(user)
+ user << browse(dat, "window=computer;size=575x450")
+ onclose(user, "computer")
+
+
+/obj/machinery/computer/syndicate_depot/set_broken()
+ . = ..()
+ if(alerts_when_broken && !has_alerted)
+ has_alerted = TRUE
+ raise_alert("[src] was damaged.")
+ disable_special_functions()
+
+/obj/machinery/computer/syndicate_depot/proc/disable_special_functions()
+ return
+
+/obj/machinery/computer/syndicate_depot/Topic(href, href_list)
+ if(..())
+ return 1
+ if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+ usr.set_machine(src)
+ if(href_list["primary"])
+ primary(usr)
+ if(href_list["secondary"])
+ secondary(usr, text2num(href_list["secondary"]))
+ add_fingerprint(usr)
+ updateUsrDialog()
+
+/obj/machinery/computer/syndicate_depot/Destroy()
+ disable_special_functions()
+ if(alerts_when_broken && !has_alerted)
+ raise_alert("[src] destroyed.")
+ return ..()
+
+
+/obj/machinery/computer/syndicate_depot/proc/get_menu(mob/user)
+ return ""
+
+/obj/machinery/computer/syndicate_depot/proc/primary(mob/user)
+ if(!allowed(user))
+ return 1
+ return 0
+
+/obj/machinery/computer/syndicate_depot/proc/secondary(mob/user, subcommand)
+ if(!allowed(user))
+ return 1
+ return 0
+
+/obj/machinery/computer/syndicate_depot/proc/raise_alert(reason)
+ if(depotarea)
+ depotarea.increase_alert(reason)
+
+
+
+// Door Control Computer
+
+/obj/machinery/computer/syndicate_depot/doors
+ name = "depot door control computer"
+
+/obj/machinery/computer/syndicate_depot/doors/get_menu(mob/user)
+ return {"Syndicate Depot Door Control Computer
+
Toggle Airlock Emergency Access
+
Toggle Hidden Doors
+
"}
+
+/obj/machinery/computer/syndicate_depot/doors/primary(mob/user)
+ if(..())
+ return
+ if(depotarea)
+ depotarea.toggle_door_locks(src)
+ to_chat(user, "Door locks toggled.")
+
+/obj/machinery/computer/syndicate_depot/doors/secondary(mob/user, subcommand)
+ if(..())
+ return
+ if(depotarea)
+ depotarea.toggle_falsewalls(src)
+ to_chat(user, "False walls toggled.")
+
+
+// Engineering AKA self destruct computer, no useful functions, just a trap for the people who can't resist pushing dangerous-sounding buttons.
+
+/obj/machinery/computer/syndicate_depot/selfdestruct
+ name = "reactor control computer"
+ icon_screen = "explosive"
+ req_access = list()
+ alerts_when_broken = TRUE
+
+/obj/machinery/computer/syndicate_depot/selfdestruct/get_menu(mob/user)
+ var menutext = {"Syndicate Depot Fusion Reactor Control
+
Disable Containment Field
+
"}
+ return menutext
+
+/obj/machinery/computer/syndicate_depot/selfdestruct/primary(mob/user)
+ if(..())
+ return
+ if(depotarea.used_self_destruct)
+ playsound(user, sound_no, 50, 0)
+ return
+ playsound(user, sound_click, 20, 1)
+ if(depotarea)
+ depotarea.activate_self_destruct("Fusion reactor containment field disengaged. All hands, evacuate. All hands, evacuate!", TRUE, user)
+
+
+// Shield computer, used to manipulate base shield, and armory shield
+
+/obj/machinery/computer/syndicate_depot/shieldcontrol
+ name = "shield control computer"
+ icon_screen = "accelerator"
+ req_access = list(access_syndicate_leader)
+ alerts_when_broken = TRUE
+ var/area/syndicate_depot/perimeter/perimeterarea
+
+/obj/machinery/computer/syndicate_depot/shieldcontrol/New()
+ . = ..()
+ perimeterarea = locate(/area/syndicate_depot/perimeter)
+ if(istype(perimeterarea) && (GAMEMODE_IS_NUCLEAR || prob(20)))
+ spawn(200)
+ perimeterarea.perimeter_shields_up()
+
+/obj/machinery/computer/syndicate_depot/shieldcontrol/Destroy()
+ if(istype(perimeterarea) && perimeterarea.shield_list.len)
+ perimeterarea.perimeter_shields_down()
+ return ..()
+
+/obj/machinery/computer/syndicate_depot/shieldcontrol/get_menu(mob/user)
+ var menutext = {"Syndicate Depot Shield Grid Control
+
"}
+ menutext += {"(SYNDI-LEADER) Whole-base Shield: [perimeterarea.shield_list.len ? "ON" : "OFF"] ([perimeterarea.shield_list.len ? "Disable" : "Enable"])
"}
+ menutext += {"(SYNDI-LEADER) Armory Shield: [depotarea.shield_list.len ? "ON" : "OFF"] ([depotarea.shield_list.len ? "Disable" : "Enable"])
"}
+ return menutext
+
+/obj/machinery/computer/syndicate_depot/shieldcontrol/primary(mob/user)
+ if(..())
+ return
+ if(depotarea.used_self_destruct)
+ playsound(user, sound_no, 50, 0)
+ return
+ if(!istype(perimeterarea))
+ return
+ if(perimeterarea.shield_list.len)
+ perimeterarea.perimeter_shields_down()
+ else
+ perimeterarea.perimeter_shields_up()
+ playsound(user, sound_yes, 50, 0)
+
+
+/obj/machinery/computer/syndicate_depot/shieldcontrol/secondary(mob/user)
+ if(..())
+ return
+ if(!istype(depotarea))
+ return
+ if(depotarea.shield_list.len)
+ depotarea.shields_down()
+ else
+ depotarea.shields_up()
+ playsound(user, sound_yes, 50, 0)
+
+
+// Syndicate comms computer, used to activate visitor mode, and message syndicate. Traitor-only use.
+
+/obj/machinery/computer/syndicate_depot/syndiecomms
+ name = "syndicate communications computer"
+ icon_screen = "syndishuttle"
+ req_access = list()
+ alerts_when_broken = TRUE
+ var/message_sent = FALSE
+
+/obj/machinery/computer/syndicate_depot/syndiecomms/New()
+ . = ..()
+ if(depotarea)
+ depotarea.comms_computer = src
+
+/obj/machinery/computer/syndicate_depot/syndiecomms/Destroy()
+ if(depotarea)
+ depotarea.comms_computer = null
+ return ..()
+
+/obj/machinery/computer/syndicate_depot/syndiecomms/get_menu(mob/user)
+ var/menu = "Syndicate Communications Relay
"
+ menu += "
One-Time Uplink to Syndicate HQ: [message_sent ? "ALREADY USED" : "AVAILABLE (Open Channel)"]"
+ if(depotarea.on_peaceful)
+ menu += "
Visiting Agents: VISIT IN PROGRESS. "
+ if(depotarea.list_includes(user, depotarea.peaceful_list))
+ menu += "[user] IS RECOGNIZED AS VISITING AGENT"
+ else
+ menu += "[user] NOT RECOGNIZED. (Sign-in as Agent)"
+ if(check_rights(R_ADMIN, 0, user))
+ menu += "
ADMIN: (End Visitor Mode)"
+
+ else
+ menu += "
Visiting Agents: NONE (Sign-in as Agent)"
+ return menu
+
+/obj/machinery/computer/syndicate_depot/syndiecomms/primary(mob/user)
+ if(..())
+ return
+ if(!isliving(user))
+ to_chat(user, "ERROR: No lifesigns detected at terminal, aborting.") // Safety to prevent aghosts accidentally pressing it and getting everyone killed.
+ return
+ if(message_sent)
+ playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ to_chat(user, "[src] has already been used to transmit a message to the Syndicate.")
+ return
+ message_sent = TRUE
+ if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR)
+ var/input = stripped_input(user, "Please choose a message to transmit to Syndicate HQ via quantum entanglement. Transmission does not guarantee a response. This function may only be used ONCE.", "To abort, send an empty message.", "") as text|null
+ if(!input)
+ message_sent = FALSE
+ return
+ Syndicate_announce(input, user)
+ to_chat(user, "Message transmitted.")
+ log_say("[key_name(user)] has sent a Syndicate comms message from the depot: [input]", user)
+ else
+ to_chat(user, "[src] requires authentication with syndicate codewords, which you do not know.")
+ raise_alert("Detected unauthorized access by [user] to [src]!")
+ updateUsrDialog()
+
+/obj/machinery/computer/syndicate_depot/syndiecomms/secondary(mob/user, subcommand)
+ if(..())
+ return
+ if(has_security_lockout(user))
+ return
+ if(depotarea)
+ if(depotarea.local_alarm || depotarea.called_backup || depotarea.used_self_destruct)
+ to_chat(user, "Visitor sign-in is not possible while the depot is on security alert.")
+ else if(depotarea.on_peaceful)
+ if(subcommand == DEPOT_VISITOR_END)
+ if(check_rights(R_ADMIN, 0, user))
+ depotarea.peaceful_mode(FALSE, TRUE)
+ else if (subcommand == DEPOT_VISITOR_ADD)
+ if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR)
+ if(depotarea.list_includes(user, depotarea.peaceful_list))
+ to_chat(user, "[user] is already signed in as a visiting agent.")
+ else
+ grant_syndie_faction(user)
+ else
+ to_chat(user, "Only verified agents of the Syndicate may sign in as visitors. Everyone else will be shot on sight.")
+ else if(subcommand == DEPOT_VISITOR_START)
+ if(depotarea.something_looted)
+ to_chat(user, "Visitor sign-in is not possible after supplies have been taken from the depot.")
+ else if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR)
+ grant_syndie_faction(user)
+ depotarea.peaceful_mode(TRUE, TRUE)
+ else
+ to_chat(user, "Only verified agents of the Syndicate may sign in as visitors. Everyone else will be shot on sight.")
+ else
+ to_chat(user, "Unrecognized subcommand: [subcommand]")
+ else
+ to_chat(user, "ERROR: [src] is unable to uplink to depot network.")
+ updateUsrDialog()
+
+/obj/machinery/computer/syndicate_depot/syndiecomms/proc/grant_syndie_faction(mob/user)
+ user.faction += "syndicate"
+ depotarea.list_add(user, depotarea.peaceful_list)
+ to_chat(user, {"
Welcome, Agent.
+ You are now signed-in as a depot visitor.
+ Any other agents with you MUST sign in themselves.
+ You may explore all rooms here, except for bolted ones.
+ Your agent ID will give you access to most doors and computers.
+ Standard Syndicate regulations apply to your visit.
+ This means if ANY of you attack facility staff, break into anything, sabotage the facility, or bring non-agents here, then ALL of you will be summarily executed.
+ Enjoy your stay.
+ "})
+
+/obj/machinery/computer/syndicate_depot/syndiecomms/power_change()
+ . = ..()
+ if(!security_lockout && (stat & NOPOWER))
+ security_lockout = TRUE
+ raise_alert("[src] lost power.")
+
+
+// Syndicate teleporter control, used to manage incoming/outgoing teleports
+
+/obj/machinery/computer/syndicate_depot/teleporter
+ name = "syndicate teleporter console"
+ icon_screen = "telesci"
+ icon_keyboard = "teleport_key"
+ var/obj/machinery/bluespace_beacon/syndicate/mybeacon
+ var/obj/effect/portal/myportal
+ var/portal_enabled = FALSE
+ var/portaldir = WEST
+
+/obj/machinery/computer/syndicate_depot/teleporter/New()
+ . = ..()
+ spawn(10)
+ findbeacon()
+ choosetarget()
+ update_portal()
+
+/obj/machinery/computer/syndicate_depot/teleporter/Destroy()
+ if(mybeacon)
+ mybeacon.mycomputer = null
+ return ..()
+
+/obj/machinery/computer/syndicate_depot/teleporter/portal_destroyed(obj/effect/portal/P)
+ myportal = null
+
+/obj/machinery/computer/syndicate_depot/teleporter/disable_special_functions()
+ if(mybeacon)
+ if(mybeacon.enabled)
+ mybeacon.toggle()
+ if(portal_enabled)
+ portal_enabled = FALSE
+ update_portal()
+
+/obj/machinery/computer/syndicate_depot/teleporter/proc/findbeacon()
+ if(mybeacon)
+ return TRUE
+ for(var/obj/machinery/bluespace_beacon/syndicate/B in myArea)
+ mybeacon = B
+ B.mycomputer = src
+ return TRUE
+ return FALSE
+
+/obj/machinery/computer/syndicate_depot/teleporter/proc/choosetarget()
+ var/list/eligible_turfs = list()
+ for(var/obj/item/radio/beacon/R in beacons)
+ var/turf/T = get_turf(R)
+ if(!is_station_level(T.z))
+ continue
+ eligible_turfs += T
+ if(eligible_turfs.len)
+ return pick(eligible_turfs)
+ else
+ return FALSE
+
+/obj/machinery/computer/syndicate_depot/teleporter/proc/update_portal()
+ if(portal_enabled && !myportal)
+ var/turf/tele_target = choosetarget()
+ if(!tele_target)
+ return
+ var/turf/portal_turf = get_step(src, portaldir)
+ var/obj/effect/portal/P = new(portal_turf, tele_target, src, 0)
+ myportal = P
+ P.failchance = 0
+ P.icon_state = "portal1"
+ var/area/A = get_area(tele_target)
+ P.name = "[A] portal"
+ else if(!portal_enabled && myportal)
+ qdel(myportal)
+ myportal = null
+
+/obj/machinery/computer/syndicate_depot/teleporter/get_menu(mob/user)
+ var/menutext = "Syndicate Teleporter Control
"
+ findbeacon()
+ if(mybeacon)
+ menutext += {"
Incoming Teleport Beacon: [mybeacon.enabled ? "ON" : "OFF"] ([mybeacon.enabled ? "Disable" : "Enable"])
"}
+ else
+ menutext += {"
Incoming Teleport Beacon: Reconnecting to beacon..."}
+ menutext += {"
Outgoing Teleport Portal: [portal_enabled ? "ON" : "OFF"]"}
+ if(check_rights(R_ADMIN, 0, user) || (depotarea.on_peaceful && !portal_enabled))
+ menutext += {" ([portal_enabled ? "Disable" : "Enable"])
"}
+ return menutext
+
+/obj/machinery/computer/syndicate_depot/teleporter/primary(mob/user)
+ if(..())
+ return
+ if(!mybeacon && user)
+ to_chat(user, "Unable to connect to teleport beacon.")
+ return
+ var/bresult = mybeacon.toggle()
+ to_chat(user, "Syndicate Teleporter Beacon: [bresult ? "ON" : "OFF"]")
+ updateUsrDialog()
+
+/obj/machinery/computer/syndicate_depot/teleporter/secondary(mob/user)
+ if(..())
+ return
+ if(!check_rights(R_ADMIN, 0, user) && !(depotarea.on_peaceful && !portal_enabled))
+ return
+ if(!portal_enabled && myportal)
+ to_chat(user, "Outgoing Teleport Portal: deactivating... please wait...")
+ return
+ toggle_portal()
+ to_chat(user, "Outgoing Teleport Portal: [portal_enabled ? "ON" : "OFF"]")
+ updateUsrDialog()
+
+/obj/machinery/computer/syndicate_depot/teleporter/proc/toggle_portal()
+ portal_enabled = !portal_enabled
+ update_portal()
+
+
+/obj/machinery/computer/syndicate_depot/aiterminal
+ name = "syndicate ai terminal"
+ icon_screen = "command"
+ req_access = list()
+
+/obj/machinery/computer/syndicate_depot/aiterminal/get_menu(mob/user)
+ var/menutext = "Syndicate AI Terminal
"
+ if(!istype(depotarea))
+ menutext += "
ERROR: Unable to connect to AI network."
+ return menutext
+
+ if(depotarea.alert_log.len)
+ menutext += "Event Log:"
+ for(var/thisline in depotarea.alert_log)
+ menutext += "- [thisline]
"
+ menutext += "
"
+ else
+ menutext += "Event Log: EMPTY"
+ menutext += "
"
+
+ menutext += "Terminated Intruders: "
+ menutext += depotarea.list_gethtmlmobs(depotarea.dead_list)
+ menutext += "
"
+
+ menutext += "Extra Security Forces: "
+ menutext += depotarea.list_gethtmlmobs(depotarea.guard_list)
+ menutext += "
"
+
+ menutext += "Visiting Agents: "
+ menutext += depotarea.list_gethtmlmobs(depotarea.peaceful_list)
+ menutext += "
"
+
+ var/has_bot = FALSE
+ for(var/mob/living/simple_animal/bot/ed209/syndicate/B in depotarea.list_getmobs(depotarea.guard_list))
+ has_bot = TRUE
+ if(has_bot)
+ menutext += "
Sentry Bot: (issue recall order)"
+ else
+ menutext += "
Sentry Bot: (none present)"
+ menutext += "
"
+
+ if(check_rights(R_ADMIN, 0, user))
+ if(depotarea.on_peaceful)
+ menutext += "
ADMIN: (To end visitor mode, use comms console.)"
+ else
+ menutext += "
ADMIN: (Reset Depot Alert Level)"
+
+ return menutext
+
+/obj/machinery/computer/syndicate_depot/aiterminal/primary(mob/user)
+ if(..())
+ return
+ if(!check_rights(R_ADMIN, 0, user))
+ return
+ if(depotarea)
+ depotarea.reset_alert()
+ to_chat(user, "Alert level reset.")
+
+/obj/machinery/computer/syndicate_depot/aiterminal/secondary(mob/user)
+ if(..())
+ return
+ for(var/mob/living/simple_animal/bot/ed209/syndicate/B in depotarea.list_getmobs(depotarea.guard_list))
+ depotarea.list_remove(B, depotarea.guard_list)
+ new /obj/effect/portal(get_turf(B))
+ to_chat(user, "[B] has been recalled.")
+ qdel(B)
+ raise_alert("Sentry bot removed via emergency recall.")
\ No newline at end of file
diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm
index dcdb4b1134e..bfa2820d9b3 100644
--- a/code/game/machinery/computer/store.dm
+++ b/code/game/machinery/computer/store.dm
@@ -13,7 +13,6 @@
/obj/machinery/computer/merch/New()
..()
-
/obj/machinery/computer/merch/attack_ai(mob/user as mob)
src.add_hiddenprint(user)
return attack_hand(user)
@@ -43,43 +42,49 @@ html {
color:#999;
}
+table {background:#303030;border:1px solid #262626;}
+
+caption {text-align:left;}
+
+.button {
+ color:#cfcfcf;
+ text-decoration:none;
+ font-weight:bold;
+ text-align:center;
+ width:75px;
+ padding:21px;
+ box-sizing:border-box;
+ background:none;
+ border:none;
+ display: inline-block;
+}
+.button:hover {color:#ffffff;}
+
a {
color:#cfcfcf;
text-decoration:none;
font-weight:bold;
}
+a:hover {color:#ffffff;}
-a:hover {
- color:#ffffff;
-}
-tr {
- background:#303030;
- border-radius:6px;
- margin-bottom:0.5em;
- border-bottom:1px solid black;
-}
-tr:nth-child(even) {
- background:#3f3f3f;
-}
+p {margin:0;}
-td.cost {
- font-size:20pt;
- font-weight:bold;
-}
+tr.dark {background:#303030;}
-td.cost.affordable {
- background:green;
-}
+tr.light {background:#3f3f3f;}
-td.cost.toomuch {
- background:maroon;
-}
+td,th {padding:15px;border-bottom:1px solid #262626;}
+th.cost {padding:0px;border-left:1px solid #262626;}
+
+th.cost.affordable {background:green;}
+
+th.cost.toomuch {background:maroon;}
- Refresh | Balance: $[balance]
+ Refresh | Balance: $[balance]
[command_name()] Merchandise
Doing your job and not getting any recognition at work? Well, welcome to the
@@ -87,8 +92,9 @@ td.cost.toomuch {
completed your Job Objectives.
Work hard. Get cash. Acquire bragging rights.
- In Stock:
+
+ In Stock:
| # |
Name/Description |
@@ -101,8 +107,11 @@ td.cost.toomuch {
if(item.cost>balance)
cost_class="toomuch"
var/itemID=centcomm_store.items.Find(item)
+ var/row_color="light"
+ if(itemID%2 == 0)
+ row_color="dark"
dat += {"
-
+
|
[itemID]
|
@@ -110,9 +119,9 @@ td.cost.toomuch {
[item.name]
[item.desc]
-
- $[item.cost]
- |
+
+ $[item.cost]
+ |
"}
dat += {"
@@ -120,7 +129,7 @@ td.cost.toomuch {