diff --git a/code/WorkInProgress/computer3/NTOS.dm b/code/WorkInProgress/computer3/NTOS.dm index 8b779d90774..b7c2defc4a1 100644 --- a/code/WorkInProgress/computer3/NTOS.dm +++ b/code/WorkInProgress/computer3/NTOS.dm @@ -25,16 +25,16 @@ i++ if(i==1) dat += "" - if(i>= 7) + if(i>= 6) i = 0 dat += "" continue dat += {" - +

[F.name] -
+
"} dat += "" @@ -53,7 +53,7 @@ i++ if(i==1) dat += "" - if(i>= 8) + if(i>= 6) i = 0 dat += "" continue diff --git a/code/WorkInProgress/computer3/computers/medical.dm b/code/WorkInProgress/computer3/computers/medical.dm index 8e6b7cb7fc1..ee55a857b29 100644 --- a/code/WorkInProgress/computer3/computers/medical.dm +++ b/code/WorkInProgress/computer3/computers/medical.dm @@ -41,6 +41,9 @@ return 0 interact() + if(!computer.cardslot) + computer.Crash(MISSING_PERIPHERAL) + return usr.set_machine(src) scan = computer.cardslot.reader if(!interactable()) diff --git a/code/WorkInProgress/computer3/computers/prisoner.dm b/code/WorkInProgress/computer3/computers/prisoner.dm index 529a210e43b..51beec5c030 100644 --- a/code/WorkInProgress/computer3/computers/prisoner.dm +++ b/code/WorkInProgress/computer3/computers/prisoner.dm @@ -5,7 +5,7 @@ icon_state = "frame-sec" /datum/file/program/prisoner - name = "Prisoner Management Comsole" + name = "Prisoner Management Console" active_state = "explosive" req_access = list(access_armory) diff --git a/code/WorkInProgress/computer3/computers/security.dm b/code/WorkInProgress/computer3/computers/security.dm index 7d94f892bbb..a9abf0a5f42 100644 --- a/code/WorkInProgress/computer3/computers/security.dm +++ b/code/WorkInProgress/computer3/computers/security.dm @@ -44,10 +44,14 @@ return 0 interact() + if(!computer.cardslot) + computer.Crash(MISSING_PERIPHERAL) + return usr.set_machine(src) scan = computer.cardslot.reader if(!interactable()) return + return if (computer.z > 6) usr << "\red Unable to establish a connection: \black You're too far away from the station!" return diff --git a/code/WorkInProgress/computer3/program.dm b/code/WorkInProgress/computer3/program.dm index 67e1d7b3d3d..4c977489f5d 100644 --- a/code/WorkInProgress/computer3/program.dm +++ b/code/WorkInProgress/computer3/program.dm @@ -349,20 +349,20 @@ Programs are a file that can be executed active_state = "computer_generic" volume = 520 -/datum/file/program/PowerMonitor +/datum/file/program/powermon name = "Power Grid" image = 'icons/ntos/power.png' active_state = "power" volume = 7200 -/datum/file/program/PrisonerManagement +/datum/file/program/prisoner name = "Prisoner Control" image = 'icons/ntos/prison.png' drm = 1 active_state = "power" volume = 5000 -/datum/file/program/Roboticscontrol +/datum/file/program/borg_control name = "Cyborg Maint" image = 'icons/ntos/borgcontrol.png' active_state = "robot"