| Name | Vitals | Position |
"
for(var/obj/item/clothing/under/C in src.tracked)
- if((C) && (C.has_sensor) && (C.loc) && (C.loc.z == 1))
+ if((C) && (C.has_sensor) && (C.loc) && (C.loc.z == 1) && C.sensor_mode)
if(istype(C.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C.loc
var/dam1 = round(H.getOxyLoss(),1)
var/dam2 = round(H.getToxLoss(),1)
var/dam3 = round(H.getFireLoss(),1)
var/dam4 = round(H.getBruteLoss(),1)
+
+ if(H.wear_id)
+ t += "| [H.wear_id.name] | "
+ else
+ t += "
| Unknown: | "
switch(C.sensor_mode)
if(1)
- if(H.wear_id)
- t += "
| [H.wear_id.name] | "
- else
- t += " |
| Unknown: | "
- t+= "[H.stat > 1 ? "Deceased" : "Living"] | Not Available |
"
+ t+= "[H.stat > 1 ? "Deceased" : "Living"] | Not Available | "
if(2)
- if(H.wear_id)
- t += "| [H.wear_id.name] | "
- else
- t += " |
| Unknown: | "
- t += "[H.stat > 1 ? "Deceased" : "Living"], [dam1] - [dam2] - [dam3] - [dam4] | Not Available |
"
+ t += "[H.stat > 1 ? "Deceased" : "Living"], [dam1] - [dam2] - [dam3] - [dam4] | Not Available | "
if(3)
- t += "| [H.name] | [H.stat > 1 ? "Deceased" : "Living"], [dam2] - [dam2] - [dam3] - [dam4] | [get_area(H)] ([H.x], [H.y]) |
"
+ t += "[H.stat > 1 ? "Deceased" : "Living"], [dam2] - [dam2] - [dam3] - [dam4] | [get_area(H)] ([H.x], [H.y]) | "
t += "
"
t += ""
user << browse(t, "window=crewcomp;size=500x800")
onclose(user, "crewcomp")
+
scan()
for(var/obj/item/clothing/under/C in world)
if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human)))
diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm
index 5539a616f49..278a0704ff8 100644
--- a/code/game/machinery/computer/hologram.dm
+++ b/code/game/machinery/computer/hologram.dm
@@ -1,3 +1,17 @@
+/obj/machinery/computer/hologram_comp
+ name = "Hologram Computer"
+ desc = "Rumoured to control holograms."
+ icon = 'stationobjs.dmi'
+ icon_state = "holo_console0"
+ var
+ obj/machinery/hologram/projector/projector = null
+ temp = null
+ lumens = 0.0
+ h_r = 245.0
+ h_g = 245.0
+ h_b = 245.0
+
+
/obj/machinery/computer/hologram_comp/New()
..()
spawn( 10 )
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
new file mode 100644
index 00000000000..11506bc3037
--- /dev/null
+++ b/code/game/machinery/computer/law.dm
@@ -0,0 +1,81 @@
+/obj/machinery/computer/aiupload
+ name = "AI Upload"
+ desc = "Used to upload laws to the AI."
+ icon_state = "command"
+ circuit = "/obj/item/weapon/circuitboard/aiupload"
+ var
+ mob/living/silicon/ai/current = null
+ opened = 0
+
+
+ verb/AccessInternals()
+ set category = "Object"
+ set name = "Access Computer's Internals"
+ set src in oview(1)
+ if(get_dist(src, usr) > 1 || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon))
+ return
+
+ opened = !opened
+ if(opened)
+ usr << "\blue The access panel is now open."
+ else
+ usr << "\blue The access panel is now closed."
+ return
+
+
+ attackby(obj/item/weapon/O as obj, mob/user as mob)
+ if(istype(O, /obj/item/weapon/aiModule))
+ var/obj/item/weapon/aiModule/M = O
+ M.install(src)
+ else
+ ..()
+
+
+ attack_hand(var/mob/user as mob)
+ if(src.stat & NOPOWER)
+ usr << "The upload computer has no power!"
+ return
+ if(src.stat & BROKEN)
+ usr << "The upload computer is broken!"
+ return
+
+ src.current = activeais()
+
+ if (!src.current)
+ usr << "No active AIs detected."
+ else
+ usr << "[src.current.name] selected for law changes."
+ return
+
+
+
+/obj/machinery/computer/borgupload
+ name = "Cyborg Upload"
+ desc = "Used to upload laws to Cyborgs."
+ icon_state = "command"
+ circuit = "/obj/item/weapon/circuitboard/borgupload"
+ var/mob/living/silicon/robot/current = null
+
+
+ attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob)
+ if(istype(module, /obj/item/weapon/aiModule))
+ module.install(src)
+ else
+ return ..()
+
+
+ attack_hand(var/mob/user as mob)
+ if(src.stat & NOPOWER)
+ usr << "The upload computer has no power!"
+ return
+ if(src.stat & BROKEN)
+ usr << "The upload computer is broken!"
+ return
+
+ src.current = freeborg()
+
+ if (!src.current)
+ usr << "No free cyborgs detected."
+ else
+ usr << "[src.current.name] selected for law changes."
+ return
\ No newline at end of file
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 0a88095bde0..ac0e8f48deb 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -1,3 +1,20 @@
+/obj/machinery/computer/med_data//TODO:SANITY
+ name = "Medical Records"
+ desc = "This can be used to check medical records."
+ icon_state = "medcomp"
+ req_access = list(access_medical)
+ circuit = "/obj/item/weapon/circuitboard/med_data"
+ var
+ obj/item/weapon/card/id/scan = null
+ authenticated = null
+ rank = null
+ screen = null
+ datum/data/record/active1 = null
+ datum/data/record/active2 = null
+ a_id = null
+ temp = null
+ printing = null
+
/obj/machinery/computer/med_data/attack_ai(user as mob)
return src.attack_hand(user)
@@ -408,3 +425,8 @@
src.updateUsrDialog()
return
+
+/obj/machinery/computer/med_data/laptop
+ name = "Medical Laptop"
+ desc = "Cheap Nanotrasen Laptop."
+ icon_state = "medlaptop"
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
new file mode 100644
index 00000000000..e529af68aad
--- /dev/null
+++ b/code/game/machinery/computer/pod.dm
@@ -0,0 +1,222 @@
+/obj/machinery/computer/pod
+ name = "Pod Launch Control"
+ desc = "A controll for launching pods. Some people prefer firing Mechas."
+ icon_state = "computer_generic"
+ var
+ id = 1.0
+ obj/machinery/mass_driver/connected = null
+ timing = 0.0
+ time = 30.0
+
+
+/obj/machinery/computer/pod/New()
+ ..()
+ spawn( 5 )
+ for(var/obj/machinery/mass_driver/M in machines)
+ if (M.id == id)
+ connected = M
+ else
+ return
+ return
+
+
+/obj/machinery/computer/pod/proc/alarm()
+ if(stat & (NOPOWER|BROKEN))
+ return
+
+ if (!( connected ))
+ viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!"
+ return
+
+ for(var/obj/machinery/door/poddoor/M in machines)
+ if (M.id == id)
+ spawn( 0 )
+ M.open()
+ return
+ sleep(20)
+
+ //connected.drive() *****RM from 40.93.3S
+ for(var/obj/machinery/mass_driver/M in machines)
+ if(M.id == id)
+ M.power = connected.power
+ M.drive()
+
+ sleep(50)
+ for(var/obj/machinery/door/poddoor/M in machines)
+ if (M.id == id)
+ spawn( 0 )
+ M.close()
+ return
+ return
+
+
+/obj/machinery/computer/pod/attackby(I as obj, user as mob)
+ if(istype(I, /obj/item/weapon/screwdriver))
+ playsound(loc, 'Screwdriver.ogg', 50, 1)
+ if(do_after(user, 20))
+ if (stat & BROKEN)
+ user << "\blue The broken glass falls out."
+ var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc )
+ new /obj/item/weapon/shard( loc )
+
+ //generate appropriate circuitboard. Accounts for /pod/old computer types
+ var/obj/item/weapon/circuitboard/pod/M = null
+ if(istype(src, /obj/machinery/computer/pod/old))
+ M = new /obj/item/weapon/circuitboard/olddoor( A )
+ if(istype(src, /obj/machinery/computer/pod/old/syndicate))
+ M = new /obj/item/weapon/circuitboard/syndicatedoor( A )
+ if(istype(src, /obj/machinery/computer/pod/old/swf))
+ M = new /obj/item/weapon/circuitboard/swfdoor( A )
+ else //it's not an old computer. Generate standard pod circuitboard.
+ M = new /obj/item/weapon/circuitboard/pod( A )
+
+ for (var/obj/C in src)
+ C.loc = loc
+ M.id = id
+ A.circuit = M
+ A.state = 3
+ A.icon_state = "3"
+ A.anchored = 1
+ del(src)
+ else
+ user << "\blue You disconnect the monitor."
+ var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc )
+
+ //generate appropriate circuitboard. Accounts for /pod/old computer types
+ var/obj/item/weapon/circuitboard/pod/M = null
+ if(istype(src, /obj/machinery/computer/pod/old))
+ M = new /obj/item/weapon/circuitboard/olddoor( A )
+ if(istype(src, /obj/machinery/computer/pod/old/syndicate))
+ M = new /obj/item/weapon/circuitboard/syndicatedoor( A )
+ if(istype(src, /obj/machinery/computer/pod/old/swf))
+ M = new /obj/item/weapon/circuitboard/swfdoor( A )
+ else //it's not an old computer. Generate standard pod circuitboard.
+ M = new /obj/item/weapon/circuitboard/pod( A )
+
+ for (var/obj/C in src)
+ C.loc = loc
+ M.id = id
+ A.circuit = M
+ A.state = 4
+ A.icon_state = "4"
+ A.anchored = 1
+ del(src)
+ else
+ attack_hand(user)
+ return
+
+
+/obj/machinery/computer/pod/attack_ai(var/mob/user as mob)
+ return attack_hand(user)
+
+
+/obj/machinery/computer/pod/attack_paw(var/mob/user as mob)
+ return attack_hand(user)
+
+
+/obj/machinery/computer/pod/attack_hand(var/mob/user as mob)
+ if(..())
+ return
+
+ var/dat = "