Send"
-
- //Request Console Logs
- if(4)
-
- var/index = 0
- /* data_rc_msg
- X - 5%
- var/rec_dpt = "Unspecified" //name of the person - 15%
- var/send_dpt = "Unspecified" //name of the sender- 15%
- var/message = "Blank" //transferred message - 300px
- var/stamp = "Unstamped" - 15%
- var/id_auth = "Unauthenticated" - 15%
- var/priority = "Normal" - 10%
- */
- dat += "Back - Refresh
"
- dat += {"| X | Sending Dep. | Receiving Dep. |
- Message | Stamp | ID Auth. | Priority. |
|---|
"}
- for(var/datum/data_rc_msg/rc in src.linkedServer.rc_msgs)
- index++
- if(index > 3000)
- break
- // Del - Sender - Recepient - Message
- // X - Al Green - Your Mom - WHAT UP!?
- dat += {"| X | [rc.send_dpt] |
- [rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] |
"}
- dat += "
"
-
-
- popup.width = 700
- popup.height = 700
- popup.set_content(dat)
- popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
- popup.open()
- return
-
-
- proc/BruteForce(mob/usr as mob)
- if(isnull(linkedServer))
- to_chat(usr, "Could not complete brute-force: Linked Server Disconnected!")
- else
- var/currentKey = src.linkedServer.decryptkey
- to_chat(usr, "Brute-force completed! The key is '[currentKey]'.")
- src.hacking = 0
- src.active_state = normal_icon
- src.screen = 0 // Return the screen back to normal
-
- proc/UnmagConsole()
- src.active_state = normal_icon
- src.emag = 0
-
- proc/ResetMessage()
- customsender = "System Administrator"
- customrecepient = null
- custommessage = "This is a test, please ignore."
- customjob = "Admin"
-
- Topic(var/href, var/list/href_list)
- if(!interactable() || ..(href,href_list))
- return
-
- if("auth" in href_list)
- if(auth)
- auth = 0
- screen = 0
- else
- var/dkey = trim(input(usr, "Please enter the decryption key.") as text|null)
- if(dkey && dkey != "")
- if(src.linkedServer.decryptkey == dkey)
- auth = 1
- else
- message = incorrectkey
-
- //Turn the server on/off.
- if("active" in href_list)
- if(auth) linkedServer.active = !linkedServer.active
- //Find a server
- if("find" in href_list)
- if(message_servers && message_servers.len > 1)
- src.linkedServer = input(usr,"Please select a server.", "Select a server.", null) as null|anything in message_servers
- message = "NOTICE: Server selected."
- else if(message_servers && message_servers.len > 0)
- linkedServer = message_servers[1]
- message = "NOTICE: Only Single Server Detected - Server selected."
- else
- message = noserver
-
- //View the logs - KEY REQUIRED
- if("view" in href_list)
- if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else
- if(auth)
- src.screen = 1
-
- //Clears the logs - KEY REQUIRED
- if("clear" in href_list)
- if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else
- if(auth)
- src.linkedServer.pda_msgs = list()
- message = "NOTICE: Logs cleared."
- //Clears the request console logs - KEY REQUIRED
- if("clearr" in href_list)
- if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else
- if(auth)
- src.linkedServer.rc_msgs = list()
- message = "NOTICE: Logs cleared."
- //Change the password - KEY REQUIRED
- if("pass" in href_list)
- if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else
- if(auth)
- var/dkey = trim(input(usr, "Please enter the decryption key.") as text|null)
- if(dkey && dkey != "")
- if(src.linkedServer.decryptkey == dkey)
- var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):"))
- if(length(newkey) <= 3)
- message = "NOTICE: Decryption key too short!"
- else if(length(newkey) > 16)
- message = "NOTICE: Decryption key too long!"
- else if(newkey && newkey != "")
- src.linkedServer.decryptkey = newkey
- message = "NOTICE: Decryption key set."
- else
- message = incorrectkey
-
- //Hack the Console to get the password
- if("hack" in href_list)
- if((istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot)) && (usr.mind.special_role && usr.mind.original == usr))
- src.hacking = 1
- src.screen = 2
- src.active_state = hack_icon
- //Time it takes to bruteforce is dependant on the password length.
- spawn(100*length(src.linkedServer.decryptkey))
- if(src && src.linkedServer && usr)
- BruteForce(usr)
- //Delete the log.
- if("delete" in href_list)
- //Are they on the view logs screen?
- if(screen == 1)
- if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else //if(istype(href_list["delete"], /datum/data_pda_msg))
- src.linkedServer.pda_msgs -= locate(href_list["delete"])
- message = "NOTICE: Log Deleted!"
- //Delete the request console log.
- if("deleter" in href_list)
- //Are they on the view logs screen?
- if(screen == 4)
- if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else //if(istype(href_list["delete"], /datum/data_pda_msg))
- src.linkedServer.rc_msgs -= locate(href_list["deleter"])
- message = "NOTICE: Log Deleted!"
- //Create a custom message
- if("msg" in href_list)
- if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else
- if(auth)
- src.screen = 3
- //Fake messaging selection - KEY REQUIRED
- if("select" in href_list)
- if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- screen = 0
- else
- switch(href_list["select"])
-
- //Reset
- if("Reset")
- ResetMessage()
-
- //Select Your Name
- if("Sender")
- customsender = input(usr, "Please enter the sender's name.") as text|null
-
- //Select Receiver
- if("Recepient")
- //Get out list of viable PDAs
- var/list/obj/item/device/pda/sendPDAs = list()
- for(var/obj/item/device/pda/P in PDAs)
- if(!P.owner || P.toff || P.hidden) continue
- sendPDAs += P
- if(PDAs && PDAs.len > 0)
- customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sendPDAs
- else
- customrecepient = null
-
-
- //Enter custom job
- if("RecJob")
- customjob = input(usr, "Please enter the sender's job.") as text|null
-
- //Enter message
- if("Message")
- custommessage = input(usr, "Please enter your message.") as text|null
- custommessage = sanitize(copytext(custommessage), 1, MAX_MESSAGE_LEN)
-
- //Send message
- if("Send")
-
- if(isnull(customsender) || customsender == "")
- customsender = "UNKNOWN"
-
- if(isnull(customrecepient))
- message = "NOTICE: No recepient selected!"
- return src.attack_hand(usr)
-
- if(isnull(custommessage) || custommessage == "")
- message = "NOTICE: No message entered!"
- return src.attack_hand(usr)
-
- var/obj/item/device/pda/PDARec = null
- for(var/obj/item/device/pda/P in PDAs)
- if(!P.owner || P.toff || P.hidden) continue
- if(P.owner == customsender)
- PDARec = P
- //Sender isn't faking as someone who exists
- if(isnull(PDARec))
- src.linkedServer.send_pda_message("[customrecepient.owner]", "[customsender]","[custommessage]")
- customrecepient.tnote += "← From [customsender] ([customjob]):
[custommessage]
"
- if(!customrecepient.silent)
- playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for(var/mob/O in hearers(3, customrecepient.loc))
- O.show_message(text("[bicon(customrecepient)] *[customrecepient.ttone]*"))
- if( customrecepient.loc && ishuman(customrecepient.loc) )
- var/mob/living/carbon/human/H = customrecepient.loc
- to_chat(H, "[bicon(customrecepient)] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)"
-
- log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
- customrecepient.overlays.Cut()
- customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
- //Sender is faking as someone who exists
- else
- src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]")
- customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
"
- if(!customrecepient.silent)
- playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for(var/mob/O in hearers(3, customrecepient.loc))
- O.show_message(text("[bicon(customrecepient)] *[customrecepient.ttone]*"))
- if( customrecepient.loc && ishuman(customrecepient.loc) )
- var/mob/living/carbon/human/H = customrecepient.loc
- to_chat(H, "[bicon(customrecepient)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)"
-
- log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
- customrecepient.overlays.Cut()
- customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r")
- //Finally..
- ResetMessage()
-
- //Request Console Logs - KEY REQUIRED
- if("viewr" in href_list)
- if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
- message = noserver
- else
- if(auth)
- src.screen = 4
-
-// to_chat(usr, href_list["select"])
-
- if("back" in href_list)
- src.screen = 0
- interact()
\ No newline at end of file
diff --git a/code/modules/computer3/computers/power.dm b/code/modules/computer3/computers/power.dm
deleted file mode 100644
index 38477be836d..00000000000
--- a/code/modules/computer3/computers/power.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/obj/machinery/computer3/powermonitor
- default_prog = /datum/file/program/powermon
- spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/networking/cable)
- icon_state = "frame-eng"
-
-/datum/file/program/powermon
- name = "power monitoring console"
- desc = "It monitors APC status."
- active_state = "power"
-
- proc/format(var/obj/machinery/power/apc/A)
- var/static/list/S = list(" Off","AOff"," On", " AOn")
- var/static/list/chg = list("N","C","F")
- return "[copytext(add_tspace("\The [A.area]", 30), 1, 30)] [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] \
- [add_lspace(A.lastused_total, 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"]
"
-
- interact()
- if(!interactable())
- return
- if(!computer.net)
- computer.Crash(MISSING_PERIPHERAL)
- return
- var/list/L = computer.net.get_machines(/obj/machinery/power/apc)
- var/t = ""
- t += "Refresh
"
- if(!L || !L.len)
- t += "No connection"
- else
- var/datum/powernet/powernet = computer.net.connect_to(/datum/powernet,null)
- if(powernet)
- t += "Total power: [powernet.avail] W
Total load: [num2text(powernet.viewload,10)] W
"
- else
- t += "Power statistics unavailable
"
- t += ""
-
- if(L.len > 0)
- t += "Area Eqp./Lgt./Env. Load Cell
"
- for(var/obj/machinery/power/apc/A in L)
- t += src.format(A)
- t += "
"
-
- popup.set_content(t)
- popup.open()
-
- Topic(var/href, var/list/href_list)
- if(!interactable() || ..(href,href_list))
- return
- interact()
diff --git a/code/modules/computer3/computers/prisoner.dm b/code/modules/computer3/computers/prisoner.dm
deleted file mode 100644
index f6e91fb9346..00000000000
--- a/code/modules/computer3/computers/prisoner.dm
+++ /dev/null
@@ -1,100 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-/obj/machinery/computer3/prisoner
- default_prog = /datum/file/program/prisoner
- spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/networking/radio)
- icon_state = "frame-sec"
-
-/datum/file/program/prisoner
- name = "Prisoner Management Console"
- active_state = "explosive"
- req_access = list(access_armory)
-
- var/id = 0.0
- var/temp = null
- var/status = 0
- var/timeleft = 60
- var/stop = 0.0
- var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
-
-
- interact()
- if(!interactable())
- return
- var/dat
- dat += "Prisoner Implant Manager System
"
- if(screen == 0)
- dat += "
Unlock Console"
- else if(screen == 1)
- dat += "
Chemical Implants
"
- var/turf/Tr = null
- for(var/obj/item/weapon/implant/chem/C in world)
- Tr = get_turf(C)
- if((Tr) && (Tr.z != computer.z)) continue//Out of range
- if(!C.implanted) continue
- dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: "
- dat += "((1))"
- dat += "((5))"
- dat += "((10))
"
- dat += "********************************
"
- dat += "
Tracking Implants
"
- for(var/obj/item/weapon/implant/tracking/T in world)
- Tr = get_turf(T)
- if((Tr) && (Tr.z != computer.z)) continue//Out of range
- if(!T.implanted) continue
- var/loc_display = "Unknown"
- var/mob/living/carbon/M = T.imp_in
- if(is_station_level(M.z) && !istype(M.loc, /turf/space))
- var/turf/mob_loc = get_turf(M)
- loc_display = mob_loc.loc
- dat += "ID: [T.id] | Location: [loc_display]
"
- dat += "(Send Message) |
"
- dat += "********************************
"
- dat += "
Lock Console"
-
- popup.width = 400
- popup.height = 500
- popup.set_content(dat)
- popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
- popup.open()
- return
-
-
- process()
- if(!..())
- interact()
- return
-
-
- Topic(href, href_list)
- if(!interactable() || ..(href,href_list))
- return
-
- if(href_list["inject1"])
- var/obj/item/weapon/implant/I = locate(href_list["inject1"])
- if(istype(I))
- I.activate(1)
-
- else if(href_list["inject5"])
- var/obj/item/weapon/implant/I = locate(href_list["inject5"])
- if(istype(I))
- I.activate(5)
-
- else if(href_list["inject10"])
- var/obj/item/weapon/implant/I = locate(href_list["inject10"])
- if(istype(I))
- I.activate(10)
-
- else if(href_list["lock"])
- screen = !screen
-
- else if(href_list["warn"])
- var/warning = trim(sanitize(copytext(input(usr,"Message:","Enter your message here!",""),1,MAX_MESSAGE_LEN)))
- if(!warning) return
- var/obj/item/weapon/implant/I = locate(href_list["warn"])
- if( istype(I) && I.imp_in)
- var/mob/living/carbon/R = I.imp_in
- log_say("PrisonComputer3 message: [key_name(usr)]->[key_name(R)] : [warning]")
- to_chat(R, "You hear a voice in your head saying: '[warning]'")
-
- interact()
- return
diff --git a/code/modules/computer3/computers/robot.dm b/code/modules/computer3/computers/robot.dm
deleted file mode 100644
index 7b7659878ea..00000000000
--- a/code/modules/computer3/computers/robot.dm
+++ /dev/null
@@ -1,208 +0,0 @@
-/obj/machinery/computer3/robotics
- default_prog = /datum/file/program/borg_control
- spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/networking/radio)
- icon_state = "frame-rnd"
-
-/datum/file/program/borg_control
- name = "Cyborg Control"
- desc = "Used to remotely lockdown or detonate linked Cyborgs."
- active_state = "robot"
- var/id = 0.0
- var/temp = null
- var/status = 0
- var/timeleft = 60
- var/stop = 0.0
- var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text
- req_access = list(access_robotics)
-
- proc/start_sequence()
- do
- if(src.stop)
- src.stop = 0
- return
- src.timeleft--
- sleep(10)
- while(src.timeleft)
-
- for(var/mob/living/silicon/robot/R in mob_list)
- if(!R.scrambledcodes)
- R.self_destruct()
- return
-
-
- interact()
- if(!interactable() || is_away_level(computer.z))
- return
- var/dat
- if(src.temp)
- dat = "[src.temp]
Clear Screen"
- else
- if(screen == 0)
- //dat += "Cyborg Control Console
"
- dat += "1. Cyborg Status
"
- dat += "2. Emergency Full Destruct
"
- if(screen == 1)
- for(var/mob/living/silicon/robot/R in mob_list)
- if(istype(usr, /mob/living/silicon/ai))
- if(R.connected_ai != usr)
- continue
- if(istype(usr, /mob/living/silicon/robot))
- if(R != usr)
- continue
- if(R.scrambledcodes)
- continue
-
- dat += "[R.name] |"
- if(R.stat)
- dat += " Not Responding |"
- else if(!R.canmove)
- dat += " Locked Down |"
- else
- dat += " Operating Normally |"
- if(!R.canmove)
- else if(R.cell)
- dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |"
- else
- dat += " No Cell Installed |"
- if(R.module)
- dat += " Module Installed ([R.module.name]) |"
- else
- dat += " No Module Installed |"
- if(R.connected_ai)
- dat += " Slaved to [R.connected_ai.name] |"
- else
- dat += " Independent from AI |"
- if(istype(usr, /mob/living/silicon))
- if(issilicon(usr) && is_special_character(usr) && !R.emagged)
- dat += "(Hack) "
- dat += "([R.canmove ? "Lockdown" : "Release"]) "
- dat += "(Destroy)"
- dat += "
"
- dat += "(Return to Main Menu)
"
- if(screen == 2)
- if(!src.status)
- dat += {"
Emergency Robot Self-Destruct
\nStatus: Off
- \n
- \nCountdown: [src.timeleft]/60 \[Reset\]
- \n
- \nStart Sequence
- \n
- \nClose"}
- else
- dat = {"Emergency Robot Self-Destruct
\nStatus: Activated
- \n
- \nCountdown: [src.timeleft]/60 \[Reset\]
- \n
\nStop Sequence
- \n
- \nClose"}
- dat += "(Return to Main Menu)
"
-
- popup.set_content(dat)
- popup.open()
- return
-
- Topic(var/href, var/list/href_list)
- if(!interactable() || ..(href,href_list))
- return
-
- if("killall" in href_list)
- src.temp = {"Destroy Robots?
-
\[Swipe ID to initiate destruction sequence\]
- Cancel"}
-
- if("do_killall" in href_list)
- var/obj/item/weapon/card/id/I = usr.get_active_hand()
- if(istype(I, /obj/item/device/pda))
- var/obj/item/device/pda/pda = I
- I = pda.id
- if(istype(I))
- if(src.check_access(I))
- if(!status)
- message_admins("[key_name_admin(usr)] has initiated the global cyborg killswitch!")
- log_game("[key_name(usr)] has initiated the global cyborg killswitch!")
- src.status = 1
- src.start_sequence()
- src.temp = null
-
- else
- to_chat(usr, "Access Denied.")
-
- if("stop" in href_list)
- src.temp = {"
- Stop Robot Destruction Sequence?
-
Yes
- No"}
-
- if("stop2" in href_list)
- src.stop = 1
- src.temp = null
- src.status = 0
-
- if("reset" in href_list)
- src.timeleft = 60
-
- if("temp" in href_list)
- src.temp = null
- if("screen" in href_list)
- switch(href_list["screen"])
- if("0")
- screen = 0
- if("1")
- screen = 1
- if("2")
- screen = 2
- if("killbot" in href_list)
- if(computer.allowed(usr))
- var/mob/living/silicon/robot/R = locate(href_list["killbot"])
- if(R)
- var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort")
- if(choice == "Confirm")
- if(R && istype(R))
- if(R.mind && R.mind.special_role && R.emagged)
- to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.")
- R.ResetSecurityCodes()
-
- else
- message_admins("[key_name_admin(usr)] detonated [R.name]!")
- log_game("[key_name_admin(usr)] detonated [R.name]!")
- R.self_destruct()
- else
- to_chat(usr, "Access Denied.")
-
- if("stopbot" in href_list)
- if(computer.allowed(usr))
- var/mob/living/silicon/robot/R = locate(href_list["stopbot"])
- if(R && istype(R)) // Extra sancheck because of input var references
- var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
- if(choice == "Confirm")
- if(R && istype(R))
- message_admins("[key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
- log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
- R.canmove = !R.canmove
- if(R.lockcharge)
- // R.cell.charge = R.lockcharge
- R.lockcharge = !R.lockcharge
- to_chat(R, "Your lockdown has been lifted!")
- else
- R.lockcharge = !R.lockcharge
- // R.cell.charge = 0
- to_chat(R, "You have been locked down!")
-
- else
- to_chat(usr, "Access Denied.")
-
- if("magbot" in href_list)
- if(computer.allowed(usr))
- var/mob/living/silicon/robot/R = locate(href_list["magbot"])
- if(R)
- var/choice = input("Are you certain you wish to hack [R.name]?") in list("Confirm", "Abort")
- if(choice == "Confirm")
- if(R && istype(R))
-// message_admins("[key_name_admin(usr)] emagged [R.name] using robotic console!")
- log_game("[key_name(usr)] emagged [R.name] using robotic console!")
- R.emagged = 1
- if(R.mind.special_role)
- R.verbs += /mob/living/silicon/robot/proc/ResetSecurityCodes
-
- interact()
- return
diff --git a/code/modules/computer3/computers/scanconsole.dm b/code/modules/computer3/computers/scanconsole.dm
deleted file mode 100644
index 747ca4b1a61..00000000000
--- a/code/modules/computer3/computers/scanconsole.dm
+++ /dev/null
@@ -1,1274 +0,0 @@
-/obj/machinery/computer3/scan_consolenew
- default_prog = /datum/file/program/dnascanner
- spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/storage/removable,/obj/item/part/computer/networking/prox)
-
-
-#define MAX_UIBLOCK 13
-#define MAX_SEBLOCK 14
-
-/datum/file/program/dnascanner
- name = "DNA Scanner and Manipulator"
- desc = "The DNA ScaM is sure to change your life forever."
- active_state = "dna"
- var/obj/machinery/dna_scannernew/scanner = null
-
- var/ui_block = 1
- var/se_block = 1
- var/subblock = 1
-
- var/uitarget = 1
- var/uitargethex = "1"
-
- var/radduration = 2
- var/radstrength = 1
-
- var/injectorready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete
-
- var/mode = 0
- // These keep track of the patient status
- var/present = 0
- var/viable = 0
-
- var/bufferlabel = ""
- var/datum/dna/buffer = null
- var/obj/item/part/computer/target_drive = null
-
- Reset()
- ..()
- mode = 0
- scanner = null
- ui_block = 1
- se_block = 1
- subblock = 1
- buffer = null
- bufferlabel = ""
-
-
- Topic(var/href, var/list/href_list)
- if(!interactable() || !computer.net || ..(href,href_list))
- return
-
- scanner = computer.net.connect_to(/obj/machinery/dna_scannernew, scanner) // if exists, will be verified
- if(!scanner)
- computer.Crash(NETWORK_FAILURE)
- return
-
- // todo check everything goddamnit
- present = scanner.occupant && scanner.occupant.dna
- viable = present && !(NOCLONE in scanner.occupant.mutations)
-
- // current screen/function
- if("mode" in href_list)
- mode = text2num(href_list["mode"])
- // locks scanner door
- if("lock" in href_list)
- scanner.locked = !scanner.locked
-
- // inject good-juice
- if("rejuv" in href_list)
- rejuv()
-
- // expose to radiation, controlled otherwise
- if("pulse" in href_list)
- pulse(href_list["pulse"]) // ui, se, or nothing/null
-
- if("duration" in href_list)
- var/modifier = text2num(href_list["duration"])
- radduration += modifier
- if("strength" in href_list)
- var/modifier = text2num(href_list["strength"])
- radstrength += modifier
-
- if("uiblock" in href_list)
- ui_block = text2num(href_list["uiblock"])
- if("seblock" in href_list)
- se_block = text2num(href_list["seblock"])
- if("subblock" in href_list)
- subblock = text2num(href_list["subblock"])
- if("uitarget" in href_list)
- uitarget = text2num(href_list["uitarget"])
- uitargethex = num2hex(uitarget)
-
- // save dna to buffer - buffer=se,ui,ue,all,clear
- if("buffer" in href_list)
- if(!viable)
- return
- var/which = href_list["buffer"]
- if(!which || which == "clear")
- buffer = null
- else
- if(!buffer)
- buffer = new
- if( which == "all" )
- buffer.unique_enzymes = scanner.occupant.dna.unique_enzymes
- buffer.struc_enzymes = scanner.occupant.dna.struc_enzymes
- buffer.uni_identity = scanner.occupant.dna.uni_identity
- buffer.real_name = scanner.occupant.dna.real_name
- buffer.mutantrace = scanner.occupant.dna.mutantrace
- if( which == "se" )
- buffer.struc_enzymes = scanner.occupant.dna.struc_enzymes
- buffer.mutantrace = scanner.occupant.dna.mutantrace
- if( which == "ui" )
- buffer.uni_identity = scanner.occupant.dna.uni_identity
- if( which == "ue" )
- buffer.uni_identity = scanner.occupant.dna.uni_identity
- buffer.unique_enzymes = scanner.occupant.dna.unique_enzymes
- buffer.real_name = scanner.occupant.dna.real_name
-
- // save buffer to file -
- if("save" in href_list)
- if(!viable || !buffer)
- return
- var/datum/file/data/genome/G = null
- var/obj/item/part/computer/dest = device
- if(target_drive)
- dest = target_drive
-
- switch(href_list["save"])
- if("se")
- if(buffer.struc_enzymes)
- G = new /datum/file/data/genome/SE()
- G.content = buffer.struc_enzymes
- G:mutantrace = buffer.mutantrace // : not . due to inheritance
- G.real_name = buffer.real_name
- if("ui")
- if(buffer.uni_identity)
- G = new /datum/file/data/genome/UI()
- G.content = buffer.uni_identity
- G.real_name = buffer.real_name
- if("ue")
- if(buffer.uni_identity)
- G = new /datum/file/data/genome/UI/UE()
- G.content = buffer.uni_identity
- G.real_name = buffer.real_name
- if(G && dest)
- var/label = input(usr, "Enter a filename:", "Save file", buffer.real_name) as text
- G.name = G.name + "([label])"
- dest:addfile(G)
-
- // load buffer from file
- if("load" in href_list)
- var/datum/file/data/genome/G = locate(href_list["load"])
- if(G)
- if(!buffer)
- buffer = new
- switch(G.type)
- if(/datum/file/data/genome/SE)
- buffer.struc_enzymes = G.content
- buffer.mutantrace = G:mutantrace
- if(/datum/file/data/genome/UI/UE)
- buffer.uni_identity = G.content
- buffer.real_name = G.real_name
- buffer.unique_enzymes = md5(buffer.real_name)
- if(/datum/file/data/genome/UI)
- buffer.uni_identity = G.content
- if(/datum/file/data/genome/cloning)
- var/datum/dna/record = G:record
- buffer.unique_enzymes = record.unique_enzymes
- buffer.struc_enzymes = record.struc_enzymes
- buffer.uni_identity = record.uni_identity
- buffer.real_name = record.real_name
- buffer.mutantrace = record.mutantrace
-
-
- // inject genetics into occupant
- if("inject" in href_list)
- if(!buffer || !viable)
- return
-
- var/which = href_list["inject"]
- var/datum/dna/target = scanner.occupant.dna
- switch(which)
- if("all",null)
- if(buffer.struc_enzymes)
- target.struc_enzymes = buffer.struc_enzymes
- if(buffer.uni_identity)
- target.uni_identity = buffer.uni_identity
- if(buffer.real_name)
- target.real_name = buffer.real_name
- target.unique_enzymes = md5(target.real_name)
- updateappearance(scanner.occupant,target.uni_identity)
- domutcheck(scanner.occupant, scanner, 1)
-
- if(ishuman(scanner.occupant))
- target.mutantrace = buffer.mutantrace
- scanner.occupant:update_mutantrace()
- if("se")
- if(buffer.struc_enzymes)
- target.struc_enzymes = buffer.struc_enzymes
- domutcheck(scanner.occupant, scanner, 1)
- if(ishuman(scanner.occupant))
- target.mutantrace = buffer.mutantrace
- scanner.occupant:update_mutantrace()
- if("ui")
- if(buffer.uni_identity)
- target.uni_identity = buffer.uni_identity
- updateappearance(scanner.occupant,target.uni_identity)
- if("ue")
- if(buffer.uni_identity)
- target.uni_identity = buffer.uni_identity
- if(buffer.real_name)
- target.real_name = buffer.real_name
- target.unique_enzymes = md5(target.real_name)
- updateappearance(scanner.occupant,target.uni_identity)
-
- // generate dna injector
- if("generate" in href_list)
- if(!buffer || !injectorready)
- return
- buffer.check_integrity()
- var/which = href_list["generate"]
- var/obj/item/weapon/dnainjector/inj
- switch(which)
- if("se")
- inj = new(computer.loc)
- inj.dnatype = "se"
- inj.dna = buffer.struc_enzymes
- inj.mutantrace = buffer.mutantrace
- inj.name = "Structural Enzymes"
- if("ui")
- inj = new(computer.loc)
- inj.dnatype = "ui"
- inj.dna = buffer.uni_identity
- inj.ue = null
- inj.name = "Unique Identifiers"
- if("ue")
- inj = new(computer.loc)
- inj.dnatype = "ui"
- inj.dna = buffer.uni_identity
- inj.ue = buffer.real_name
- inj.name = "Unique Enzymes + Unique Identifiers"
- if(inj)
- injectorready = 0
- spawn(300)
- injectorready = 1
- var/label = input(usr, "Enter a label", "Label [inj.name] Injector", buffer.real_name) as null|text
- if(label && inj) // it's possible it was deleted before we get here, input suspends execution
- inj.name += " ([label])"
-
- interact()
- return // putting this in there to visually mark the end of topic() while I do other things
-
- proc/menu()
- if(!present && (mode==1 || mode==2)) // require viable occupant
- mode = 0
- switch(mode)
- if(0) // MAIN MENU
- return main_menu()
-
- if(1)
- return ui_menu()
- if(2)
- return se_menu()
-
- if(3)
- return emitter_menu()
-
- if(4)
- return buffer_menu()
-
- // unified header with health data
- // option to show UI,UE,SE as plaintext
- proc/status_display(var/dna_summary = 0)
- var/mob/living/occupant = scanner.occupant
- var/status_html
- if(viable)
- status_html = "Health:
[occupant.health]%
Radiation Level:
[occupant.radiation]%
Rejuvenators:
[occupant.reagents.get_reagent_amount("inaprovaline")] units
Unique Enzymes :
[uppertext(occupant.dna.unique_enzymes)]
Unique Identifier:
[occupant.dna.uni_identity]
Structural Enzymes:
[occupant.dna.struc_enzymes]
"
- var/dat = "Scanner Status
[topic_link(src,"","Scan")][occupant_status][status_html]
"
- if(present)
- dat += topic_link(src,"lock",scanner.locked?"Unlock Scanner":"Lock Scanner") + " " + topic_link(src,"rejuv","Inject Rejuvenators")
- else
- dat += "[scanner.locked?"Unlock Scanner":"Lock Scanner"] Inject Rejuvenators"
- return dat
-
- proc/main_menu()
- var/dat = status_display(dna_summary = 1)
- dat += "
Main Menu
"
- if(present)
- dat += topic_link(src,"mode=1","Modify Unique Identifier") + "
" + topic_link(src,"mode=2","Modify Structural Enzymes") + "
"
- else
- dat += "Modify Unique Identifier
Modify Structural Enzymes
"
- dat += topic_link(src,"mode=3","Radiation Emitter Settings") + "
" + topic_link(src,"mode=4","Transfer Buffer")
- return dat
-
-
- proc/block_plus_minus(var/topicstr, var/blockval,var/min,var/max)
- var/left = blockval - 1
- var/right = blockval + 1
- if(left < min)
- left = max
- if(right > max)
- right = min
- return topic_link(src,"[topicstr]=[left]","<-") + " [blockval] " + topic_link(src,"[topicstr]=[right]","->")
-
-
- proc/getblockstring(var/ui = 0)
- var/mainblock = "seblock"
- var/block = se_block
- var/input = scanner.occupant.dna.struc_enzymes
- if(ui)
- mainblock = "uiblock"
- block = ui_block
- input = scanner.occupant.dna.uni_identity
-
- var/string = ""
- var/subpos = 1 // keeps track of the current sub block
- var/blockpos = 1
-
- for(var/i = 1, i <= length(input), i++) // loop through each letter
-
- if(blockpos == block && subpos == subblock) // if the current block/subblock is selected, mark it
- string += fake_link(copytext(input,i,i+1))
- else
- string += topic_link(src,"[mainblock]=[blockpos];subblock=[subpos]",copytext(input,i,i+1))
-
- subpos++
- if(subpos > 3) // add a line break for every block
- string += "
"
- subpos = 1
- blockpos++
-
- string += "
")
- dat += "Modify Unique Identifier
"
- dat += "Unique Identifier:
[getblockstring(ui=1)]
"
-
- dat += "Selected Block: " + block_plus_minus("uiblock",ui_block,1,MAX_UIBLOCK) + "
"
- dat += "Selected Sub-Block: " + block_plus_minus("subblock",subblock,1,3) + "
"
- dat += "Selected Target: " + block_plus_minus("uitarget",uitarget,0,15) + "
"
- dat += "Modify Block
"
- dat += topic_link(src,"pulse=ui","Irradiate") + "
"
- return dat
-
- proc/se_menu()
- if(!viable)
- return "No viable occupant detected."
- to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
")
- dat += "Modify Structural Enzymes
"
- dat += "Structural Enzymes: [getblockstring(ui=0)]
"
- dat += "Selected Block: " + block_plus_minus("seblock",se_block,1,MAX_SEBLOCK) + "
"
- dat += "Selected Sub-Block: " + block_plus_minus("subblock",subblock,1,3) + "
"
- dat += "Modify Block
"
- dat += topic_link(src,"pulse=se","Irradiate") + "
"
- return dat
-
- proc/emitter_menu()
- to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
")
- dat += "Radiation Emitter Settings
"
- if(viable)
- dat += topic_link(src,"pulse","Pulse Radiation")
- else
- dat += fake_link("Pulse Radiation")
- dat += "
"
- dat += "Radiation Duration: " + block_plus_minus("duration",radduration,1,20) + "
"
- dat += "Radiation Intensity: " + block_plus_minus("strength",radstrength,1,10) + "
"
- return dat
-
- proc/buffer_menu()
-
- interact()
- if(!interactable())
- return
- popup.add_stylesheet("scannernew", 'html/browser/scannernew.css')
-
- if(!computer.net)
- computer.Crash(MISSING_PERIPHERAL)
- return
-
- scanner = computer.net.connect_to(/obj/machinery/dna_scannernew, scanner) // if exists, will be verified
- if(!scanner)
- computer.Crash(NETWORK_FAILURE)
- return
-
- // todo check everything goddamnit
-
- present = scanner.occupant && scanner.occupant.dna
- viable = present && !(NOCLONE in scanner.occupant.mutations)
-
- popup.set_content(menu())
- popup.open()
-
- proc/pulse(var/target as null|anything in list("ui","se"))
-
- //Makes sure someone is in there (And valid) before trying anything
- //More than anything, this just acts as a sanity check in case the option DOES appear for whatever reason
-
- if(target != "ui" && target != "se")
- target = null
-
- // transforms into the fail condition instead of having it in yet another nested if block
- else if( prob(20 - (radduration / 2)))
- target += "-f"
-
- if(!viable)
- popup.set_content("No viable occupant detected.")
- popup.open()
- else
- popup.set_content("Working ... Please wait ([radduration]) Seconds)")
- popup.open()
-
- var/lock_state = scanner.locked
- scanner.locked = 1//lock it
- sleep(10*radduration)
-
- switch(target)
- if("ui")
- var/ui = scanner.occupant.dna.uni_identity
- var/block = getblock(ui,ui_block,3)
- var/result = ""
- for(var/sb = 1; sb <=3; sb++)
- var/temp = copytext(block,sb,sb+1)
- if(sb == subblock)
- temp = miniscramble("[uitargethex]",radstrength,radduration)
- result += temp
- scanner.occupant.dna.uni_identity = setblock(ui, ui_block, result,3)
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
- if("ui-f")
- if(prob(20+radstrength))
- randmutb(scanner.occupant)
- domutcheck(scanner.occupant,scanner)
- else
- randmuti(scanner.occupant)
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE)
-
- if("se")
- var/se = scanner.occupant.dna.struc_enzymes
- var/targetblock = se_block
-
- if(!(se_block in list(2,8,10,12)) && prob (20)) // shifts the target slightly
- if(se_block <= 5)
- targetblock++
- else
- targetblock--
- var/block = getblock(scanner.occupant.dna.struc_enzymes,targetblock,3)
-
- var/result = ""
- for(var/sb = 1; sb <=3; sb++)
- var/temp = copytext(block,sb,sb+1)
- if(sb == subblock)
- temp = miniscramble(temp,radstrength,radduration)
- result += temp
-
- scanner.occupant.dna.struc_enzymes = setblock(se, se_block, result,3)
- domutcheck(scanner.occupant,scanner)
- scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
- if("se-f")
- if(prob(80-radduration))
- randmutb(scanner.occupant)
- domutcheck(scanner.occupant,scanner)
- else
- randmuti(scanner.occupant)
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE)
-
- if(null)
- if(prob(95))
- if(prob(75))
- randmutb(scanner.occupant)
- else
- randmuti(scanner.occupant)
- else
- if(prob(95))
- randmutg(scanner.occupant)
- else
- randmuti(scanner.occupant)
- scanner.occupant.apply_effect((radstrength*3)+radduration*3, IRRADIATE)
-
-
- scanner.locked = lock_state
- interact()
-
- proc/rejuv()
- if(!viable)
- popup.set_content("No viable occupant detected.")
- popup.open()
- var/mob/living/carbon/human/H = scanner.occupant
- if(istype(H))
- var/inap = H.reagents.get_reagent_amount("inaprovaline") // oh my *god* this section was ugly before I shortened it
-
- if(inap < (REJUVENATORS_MAX - REJUVENATORS_INJECT))
- H.reagents.add_reagent("inaprovaline", REJUVENATORS_INJECT)
- else
- H.reagents.add_reagent("inaprovaline", max(REJUVENATORS_MAX - inap,0))
-
-/*
-/obj/machinery/computer/scan_consolenew/Topic(href, href_list)
-
- temp_html = null
- var/temp_header_html = null
- var/temp_footer_html = null
-
- scanner_status_html = null // Scanner status is reset each update
- var/mob/living/occupant = scanner.occupant
- var/viable_occupant = (occupant && occupant.dna && !(NOCLONE in occupant.mutations))
- var/mob/living/carbon/human/human_occupant = scanner.occupant
-
- if(href_list["screen"]) // Passing a screen is only a request, we set current_screen here but it can be overridden below if necessary
- current_screen = href_list["screen"]
-
- if(!viable_occupant) // If there is no viable occupant only allow certain screens
- var/allowed_no_occupant_screens = list("mainmenu", "radsetmenu", "buffermenu") //These are the screens which will be allowed if there's no occupant
- if(!(current_screen in allowed_no_occupant_screens))
- href_list = new /list(0) // clear list of options
- current_screen = "mainmenu"
-
-
- if(!current_screen) // If no screen is set default to mainmenu
- current_screen = "mainmenu"
-
-
- if(!scanner) //Is the scanner not connected?
- scanner_status_html = "ERROR: No DNA Scanner connected."
- current_screen = null // blank does not exist in the switch below, so no screen will be outputted
- updateUsrDialog()
- return
-
- usr.set_machine(src)
- if(href_list["locked"])
- if(scanner.occupant)
- scanner.locked = !( scanner.locked )
- ////////////////////////////////////////////////////////
- if(href_list["genpulse"])
- if(!viable_occupant)//Makes sure someone is in there (And valid) before trying anything
- temp_html = text("No viable occupant detected.")//More than anything, this just acts as a sanity check in case the option DOES appear for whatever reason
- //usr << browse(temp_html, "window=scannernew;size=550x650")
- //onclose(usr, "scannernew")
- popup.set_content(temp_html)
- popup.open()
- else
-
- temp_html = text("Working ... Please wait ([] Seconds)", radduration)
- popup.set_content(temp_html)
- popup.open()
- var/lock_state = scanner.locked
- scanner.locked = 1//lock it
- sleep(10*radduration)
- if(!scanner.occupant)
- temp_html = null
- return null
- if(prob(95))
- if(prob(75))
- randmutb(scanner.occupant)
- else
- randmuti(scanner.occupant)
- else
- if(prob(95))
- randmutg(scanner.occupant)
- else
- randmuti(scanner.occupant)
- scanner.occupant.apply_effect((radstrength*3)+radduration*3, IRRADIATE)
- scanner.locked = lock_state
- temp_html = null
- dopage(src,"screen=radsetmenu")
- if(href_list["radleplus"])
- if(!viable_occupant)
- temp_html = text("No viable occupant detected.")
- popup.set_content(temp_html)
- popup.open()
- if(radduration < 20)
- radduration++
- radduration++
- dopage(src,"screen=radsetmenu")
- if(href_list["radleminus"])
- if(!viable_occupant)
- temp_html = text("No viable occupant detected.")
- popup.set_content(temp_html)
- popup.open()
- if(radduration > 2)
- radduration--
- radduration--
- dopage(src,"screen=radsetmenu")
- if(href_list["radinplus"])
- if(radstrength < 10)
- radstrength++
- dopage(src,"screen=radsetmenu")
- if(href_list["radinminus"])
- if(radstrength > 1)
- radstrength--
- dopage(src,"screen=radsetmenu")
- ////////////////////////////////////////////////////////
- if(href_list["unimenuplus"])
- if(ui_block < 13)
- ui_block++
- else
- ui_block = 1
- dopage(src,"screen=unimenu")
- if(href_list["unimenuminus"])
- if(ui_block > 1)
- ui_block--
- else
- ui_block = 13
- dopage(src,"screen=unimenu")
- if(href_list["unimenusubplus"])
- if(subblock < 3)
- subblock++
- else
- subblock = 1
- dopage(src,"screen=unimenu")
- if(href_list["unimenusubminus"])
- if(subblock > 1)
- subblock--
- else
- subblock = 3
- dopage(src,"screen=unimenu")
- if(href_list["unimenutargetplus"])
- if(unitarget < 15)
- unitarget++
- unitargethex = unitarget
- switch(unitarget)
- if(10)
- unitargethex = "A"
- if(11)
- unitargethex = "B"
- if(12)
- unitargethex = "C"
- if(13)
- unitargethex = "D"
- if(14)
- unitargethex = "E"
- if(15)
- unitargethex = "F"
- else
- unitarget = 0
- unitargethex = 0
- dopage(src,"screen=unimenu")
- if(href_list["unimenutargetminus"])
- if(unitarget > 0)
- unitarget--
- unitargethex = unitarget
- switch(unitarget)
- if(10)
- unitargethex = "A"
- if(11)
- unitargethex = "B"
- if(12)
- unitargethex = "C"
- if(13)
- unitargethex = "D"
- if(14)
- unitargethex = "E"
- else
- unitarget = 15
- unitargethex = "F"
- dopage(src,"screen=unimenu")
- if(href_list["uimenuset"] && href_list["uimenusubset"]) // This chunk of code updates selected block / sub-block based on click
- var/menuset = text2num(href_list["uimenuset"])
- var/menusubset = text2num(href_list["uimenusubset"])
- if((menuset <= 13) && (menuset >= 1))
- ui_block = menuset
- if((menusubset <= 3) && (menusubset >= 1))
- subblock = menusubset
- dopage(src, "unimenu")
- if(href_list["unipulse"])
- if(scanner.occupant)
- var/block
- var/newblock
- var/tstructure2
- block = getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),subblock,1)
-
- temp_html = text("Working ... Please wait ([] Seconds)", radduration)
- popup.set_content(temp_html)
- popup.open()
- var/lock_state = scanner.locked
- scanner.locked = 1//lock it
- sleep(10*radduration)
- if(!scanner.occupant)
- temp_html = null
- return null
- ///
- if(prob((80 + (radduration / 2))))
- block = miniscrambletarget(num2text(unitarget), radstrength, radduration)
- newblock = null
- if(subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),2,1) + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),3,1)
- if(subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),3,1)
- if(subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),1,1) + getblock(getblock(scanner.occupant.dna.uni_identity,ui_block,3),2,1) + block
- tstructure2 = setblock(scanner.occupant.dna.uni_identity, ui_block, newblock,3)
- scanner.occupant.dna.uni_identity = tstructure2
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
- else
- if(prob(20+radstrength))
- randmutb(scanner.occupant)
- domutcheck(scanner.occupant,scanner)
- else
- randmuti(scanner.occupant)
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE)
- scanner.locked = lock_state
- dopage(src,"screen=unimenu")
-
- ////////////////////////////////////////////////////////
- if(href_list["rejuv"])
- if(!viable_occupant)
- temp_html = text("No viable occupant detected.")
- popup.set_content(temp_html)
- popup.open()
- else
- if(human_occupant)
- if(human_occupant.reagents.get_reagent_amount("inaprovaline") < REJUVENATORS_MAX)
- if(human_occupant.reagents.get_reagent_amount("inaprovaline") < (REJUVENATORS_MAX - REJUVENATORS_INJECT))
- human_occupant.reagents.add_reagent("inaprovaline", REJUVENATORS_INJECT)
- else
- human_occupant.reagents.add_reagent("inaprovaline", round(REJUVENATORS_MAX - human_occupant.reagents.get_reagent_amount("inaprovaline")))
-// to_chat(usr, text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline")))
-
- ////////////////////////////////////////////////////////
- if(href_list["strucmenuplus"])
- if(se_block < 14)
- se_block++
- else
- se_block = 1
- dopage(src,"screen=strucmenu")
- if(href_list["strucmenuminus"])
- if(se_block > 1)
- se_block--
- else
- se_block = 14
- dopage(src,"screen=strucmenu")
- if(href_list["strucmenusubplus"])
- if(subblock < 3)
- subblock++
- else
- subblock = 1
- dopage(src,"screen=strucmenu")
- if(href_list["strucmenusubminus"])
- if(subblock > 1)
- subblock--
- else
- subblock = 3
- dopage(src,"screen=strucmenu")
- if(href_list["semenuset"] && href_list["semenusubset"]) // This chunk of code updates selected block / sub-block based on click (se stands for strutural enzymes)
- var/menuset = text2num(href_list["semenuset"])
- var/menusubset = text2num(href_list["semenusubset"])
- if((menuset <= 14) && (menuset >= 1))
- se_block = menuset
- if((menusubset <= 3) && (menusubset >= 1))
- subblock = menusubset
- dopage(src, "strucmenu")
- if(href_list["strucpulse"])
- var/block
- var/newblock
- var/tstructure2
- var/oldblock
- var/lock_state = scanner.locked
- scanner.locked = 1//lock it
- if(viable_occupant)
- block = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),subblock,1)
-
- temp_html = text("Working ... Please wait ([] Seconds)", radduration)
- popup.set_content(temp_html)
- popup.open()
- sleep(10*radduration)
- else
- temp_html = null
- return null
- ///
- if(viable_occupant)
- if(prob((80 + (radduration / 2))))
- if((se_block != 2 || se_block != 12 || se_block != 8 || se_block || 10) && prob (20))
- oldblock = se_block
- block = miniscramble(block, radstrength, radduration)
- newblock = null
- if(se_block > 1 && se_block < 5)
- se_block++
- else if(se_block > 5 && se_block < 14)
- se_block--
- if(subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
- if(subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
- if(subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + block
- tstructure2 = setblock(scanner.occupant.dna.struc_enzymes, se_block, newblock,3)
- scanner.occupant.dna.struc_enzymes = tstructure2
- domutcheck(scanner.occupant,scanner)
- scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
- se_block = oldblock
- else
- //
- block = miniscramble(block, radstrength, radduration)
- newblock = null
- if(subblock == 1) newblock = block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
- if(subblock == 2) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + block + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),3,1)
- if(subblock == 3) newblock = getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),1,1) + getblock(getblock(scanner.occupant.dna.struc_enzymes,se_block,3),2,1) + block
- tstructure2 = setblock(scanner.occupant.dna.struc_enzymes, se_block, newblock,3)
- scanner.occupant.dna.struc_enzymes = tstructure2
- domutcheck(scanner.occupant,scanner)
- scanner.occupant.apply_effect(radstrength+radduration, IRRADIATE)
- else
- if(prob(80-radduration))
- randmutb(scanner.occupant)
- domutcheck(scanner.occupant,scanner)
- else
- randmuti(scanner.occupant)
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- scanner.occupant.apply_effect((radstrength*2)+radduration, IRRADIATE)
- scanner.locked = lock_state
- ///
- dopage(src,"screen=strucmenu")
-
- ////////////////////////////////////////////////////////
- if(href_list["b1addui"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer1iue = 0
- buffer1 = scanner.occupant.dna.uni_identity
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer1owner = scanner.occupant.name
- else
- buffer1owner = scanner.occupant.real_name
- buffer1label = "Unique Identifier"
- buffer1type = "ui"
- dopage(src,"screen=buffermenu")
- if(href_list["b1adduiue"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer1 = scanner.occupant.dna.uni_identity
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer1owner = scanner.occupant.name
- else
- buffer1owner = scanner.occupant.real_name
- buffer1label = "Unique Identifier & Unique Enzymes"
- buffer1type = "ui"
- buffer1iue = 1
- dopage(src,"screen=buffermenu")
- if(href_list["b2adduiue"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer2 = scanner.occupant.dna.uni_identity
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer2owner = scanner.occupant.name
- else
- buffer2owner = scanner.occupant.real_name
- buffer2label = "Unique Identifier & Unique Enzymes"
- buffer2type = "ui"
- buffer2iue = 1
- dopage(src,"screen=buffermenu")
- if(href_list["b3adduiue"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer3 = scanner.occupant.dna.uni_identity
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer3owner = scanner.occupant.name
- else
- buffer3owner = scanner.occupant.real_name
- buffer3label = "Unique Identifier & Unique Enzymes"
- buffer3type = "ui"
- buffer3iue = 1
- dopage(src,"screen=buffermenu")
- if(href_list["b2addui"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer2iue = 0
- buffer2 = scanner.occupant.dna.uni_identity
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer2owner = scanner.occupant.name
- else
- buffer2owner = scanner.occupant.real_name
- buffer2label = "Unique Identifier"
- buffer2type = "ui"
- dopage(src,"screen=buffermenu")
- if(href_list["b3addui"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer3iue = 0
- buffer3 = scanner.occupant.dna.uni_identity
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer3owner = scanner.occupant.name
- else
- buffer3owner = scanner.occupant.real_name
- buffer3label = "Unique Identifier"
- buffer3type = "ui"
- dopage(src,"screen=buffermenu")
- if(href_list["b1addse"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer1iue = 0
- buffer1 = scanner.occupant.dna.struc_enzymes
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer1owner = scanner.occupant.name
- else
- buffer1owner = scanner.occupant.real_name
- buffer1label = "Structural Enzymes"
- buffer1type = "se"
- dopage(src,"screen=buffermenu")
- if(href_list["b2addse"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer2iue = 0
- buffer2 = scanner.occupant.dna.struc_enzymes
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer2owner = scanner.occupant.name
- else
- buffer2owner = scanner.occupant.real_name
- buffer2label = "Structural Enzymes"
- buffer2type = "se"
- dopage(src,"screen=buffermenu")
- if(href_list["b3addse"])
- if(scanner.occupant && scanner.occupant.dna)
- buffer3iue = 0
- buffer3 = scanner.occupant.dna.struc_enzymes
- if(!istype(scanner.occupant,/mob/living/carbon/human))
- buffer3owner = scanner.occupant.name
- else
- buffer3owner = scanner.occupant.real_name
- buffer3label = "Structural Enzymes"
- buffer3type = "se"
- dopage(src,"screen=buffermenu")
- if(href_list["b1clear"])
- buffer1 = null
- buffer1owner = null
- buffer1label = null
- buffer1iue = null
- dopage(src,"screen=buffermenu")
- if(href_list["b2clear"])
- buffer2 = null
- buffer2owner = null
- buffer2label = null
- buffer2iue = null
- dopage(src,"screen=buffermenu")
- if(href_list["b3clear"])
- buffer3 = null
- buffer3owner = null
- buffer3label = null
- buffer3iue = null
- dopage(src,"screen=buffermenu")
- if(href_list["b1label"])
- buffer1label = sanitize(input("New Label:","Edit Label","Infos here"))
- dopage(src,"screen=buffermenu")
- if(href_list["b2label"])
- buffer2label = sanitize(input("New Label:","Edit Label","Infos here"))
- dopage(src,"screen=buffermenu")
- if(href_list["b3label"])
- buffer3label = sanitize(input("New Label:","Edit Label","Infos here"))
- dopage(src,"screen=buffermenu")
- if(href_list["b1transfer"])
- if(!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
- return
- if(buffer1type == "ui")
- if(buffer1iue)
- scanner.occupant.real_name = buffer1owner
- scanner.occupant.name = buffer1owner
- scanner.occupant.dna.uni_identity = buffer1
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- else if(buffer1type == "se")
- scanner.occupant.dna.struc_enzymes = buffer1
- domutcheck(scanner.occupant,scanner)
- temp_html = "Transfered."
- scanner.occupant.apply_effect(rand(20,50), IRRADIATE)
-
- if(href_list["b2transfer"])
- if(!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
- return
- if(buffer2type == "ui")
- if(buffer2iue)
- scanner.occupant.real_name = buffer2owner
- scanner.occupant.name = buffer2owner
- scanner.occupant.dna.uni_identity = buffer2
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- else if(buffer2type == "se")
- scanner.occupant.dna.struc_enzymes = buffer2
- domutcheck(scanner.occupant,scanner)
- temp_html = "Transfered."
- scanner.occupant.apply_effect(rand(20,50), IRRADIATE)
-
- if(href_list["b3transfer"])
- if(!scanner.occupant || (NOCLONE in scanner.occupant.mutations) || !scanner.occupant.dna)
- return
- if(buffer3type == "ui")
- if(buffer3iue)
- scanner.occupant.real_name = buffer3owner
- scanner.occupant.name = buffer3owner
- scanner.occupant.dna.uni_identity = buffer3
- updateappearance(scanner.occupant,scanner.occupant.dna.uni_identity)
- else if(buffer3type == "se")
- scanner.occupant.dna.struc_enzymes = buffer3
- domutcheck(scanner.occupant,scanner)
- temp_html = "Transfered."
- scanner.occupant.apply_effect(rand(20,50), IRRADIATE)
-
- if(href_list["b1injector"])
- if(injectorready)
- var/obj/item/tool/medical/dnainjector/I = new /obj/item/tool/medical/dnainjector
- I.dna = buffer1
- I.dnatype = buffer1type
- I.loc = loc
- I.name += " ([buffer1label])"
- if(buffer1iue) I.ue = buffer1owner //lazy haw haw
- temp_html = "Injector created."
-
- injectorready = 0
- spawn(300)
- injectorready = 1
- else
- temp_html = "Replicator not ready yet."
-
- if(href_list["b2injector"])
- if(injectorready)
- var/obj/item/tool/medical/dnainjector/I = new /obj/item/tool/medical/dnainjector
- I.dna = buffer2
- I.dnatype = buffer2type
- I.loc = loc
- I.name += " ([buffer2label])"
- if(buffer2iue) I.ue = buffer2owner //lazy haw haw
- temp_html = "Injector created."
-
- injectorready = 0
- spawn(300)
- injectorready = 1
- else
- temp_html = "Replicator not ready yet."
-
- if(href_list["b3injector"])
- if(injectorready)
- var/obj/item/tool/medical/dnainjector/I = new /obj/item/tool/medical/dnainjector
- I.dna = buffer3
- I.dnatype = buffer3type
- I.loc = loc
- I.name += " ([buffer3label])"
- if(buffer3iue) I.ue = buffer3owner //lazy haw haw
- temp_html = "Injector created."
-
- injectorready = 0
- spawn(300)
- injectorready = 1
- else
- temp_html = "Replicator not ready yet."
-
- ////////////////////////////////////////////////////////
- if(href_list["load_disk"])
- var/buffernum = text2num(href_list["load_disk"])
- if((buffernum > 3) || (buffernum < 1))
- return
- if((isnull(diskette)) || (!diskette.data) || (diskette.data == ""))
- return
- switch(buffernum)
- if(1)
- buffer1 = diskette.data
- buffer1type = diskette.data_type
- buffer1iue = diskette.ue
- buffer1owner = diskette.owner
- if(2)
- buffer2 = diskette.data
- buffer2type = diskette.data_type
- buffer2iue = diskette.ue
- buffer2owner = diskette.owner
- if(3)
- buffer3 = diskette.data
- buffer3type = diskette.data_type
- buffer3iue = diskette.ue
- buffer3owner = diskette.owner
- temp_html = "Data loaded."
-
- if(href_list["save_disk"])
- var/buffernum = text2num(href_list["save_disk"])
- if((buffernum > 3) || (buffernum < 1))
- return
- if((isnull(diskette)) || (diskette.read_only))
- return
- switch(buffernum)
- if(1)
- diskette.data = buffer1
- diskette.data_type = buffer1type
- diskette.ue = buffer1iue
- diskette.owner = buffer1owner
- diskette.name = "data disk - '[buffer1owner]'"
- if(2)
- diskette.data = buffer2
- diskette.data_type = buffer2type
- diskette.ue = buffer2iue
- diskette.owner = buffer2owner
- diskette.name = "data disk - '[buffer2owner]'"
- if(3)
- diskette.data = buffer3
- diskette.data_type = buffer3type
- diskette.ue = buffer3iue
- diskette.owner = buffer3owner
- diskette.name = "data disk - '[buffer3owner]'"
- temp_html = "Data saved."
- if(href_list["eject_disk"])
- if(!diskette)
- return
- diskette.loc = get_turf(src)
- diskette = null
- ////////////////////////////////////////////////////////
-
- temp_html = temp_header_html
- switch(current_screen)
- if("mainmenu")
- temp_html += "Main Menu
"
- if(viable_occupant) //is there REALLY someone in there who can be modified?
- temp_html += "Modify Unique Identifier
"
- temp_html += "Modify Structural Enzymes
"
- else
- temp_html += "Modify Unique Identifier
"
- temp_html += "Modify Structural Enzymes
"
- temp_html += "Radiation Emitter Settings
"
- temp_html += "Transfer Buffer
"
-
- if("unimenu")
- if(!viable_occupant)
- temp_html = text("No viable occupant detected.")
- popup.set_content(temp_html)
- popup.open()
- else
- temp_html = "<< Main Menu
"
- temp_html += "Modify Unique Identifier
"
- temp_html += "Unique Identifier:
[getblockstring(scanner.occupant.dna.uni_identity,ui_block,subblock,3, src,1)]
"
- temp_html += "Selected Block:
<- [ui_block] ->"
- temp_html += "Selected Sub-Block:
<- [subblock] ->"
- temp_html += "Selected Target:
<- [unitargethex] ->"
- temp_html += "
Modify Block"
- temp_html += "
Irradiate
"
- temp_html += "Modify Structural Enzymes
"
- temp_html += "Structural Enzymes: [getblockstring(scanner.occupant.dna.struc_enzymes,se_block,subblock,3,src,0)]
"
- temp_html += "Selected Block:
<- [se_block] ->"
- temp_html += "Selected Sub-Block:
<- [subblock] ->"
- temp_html += "
Modify Block"
- temp_html += "
Irradiate
"
- temp_html += "Radiation Emitter Settings
"
- if(viable_occupant)
- temp_html += "Pulse Radiation"
- else
- temp_html += "Pulse Radiation"
- temp_html += "
Radiation Duration: - [radduration] +
"
- temp_html += "Radiation Intensity: - [radstrength] +
"
-
- if("buffermenu")
- temp_html = "<< Main Menu
"
- temp_html += "Transfer Buffer
"
- temp_html += "Buffer 1:
"
- if(!(buffer1))
- temp_html += "Buffer Empty
"
- else
- temp_html += text("Data: []
", buffer1)
- temp_html += text("By: []
", buffer1owner)
- temp_html += text("Label: []
", buffer1label)
- if(viable_occupant) temp_html += "Save : UI - UI+UE - SE
"
- if(buffer1) temp_html += "Transfer to: Occupant - Injector
"
- //if(buffer1) temp_html += "Isolate Block
"
- if(buffer1) temp_html += "Disk: Save To | Load From
"
- if(buffer1) temp_html += "Edit Label
"
- if(buffer1) temp_html += "Clear Buffer
"
- if(!buffer1) temp_html += "
"
- temp_html += "Buffer 2:
"
- if(!(buffer2))
- temp_html += "Buffer Empty
"
- else
- temp_html += text("Data: []
", buffer2)
- temp_html += text("By: []
", buffer2owner)
- temp_html += text("Label: []
", buffer2label)
- if(viable_occupant) temp_html += "Save : UI - UI+UE - SE
"
- if(buffer2) temp_html += "Transfer to: Occupant - Injector
"
- //if(buffer2) temp_html += "Isolate Block
"
- if(buffer2) temp_html += "Disk: Save To | Load From
"
- if(buffer2) temp_html += "Edit Label
"
- if(buffer2) temp_html += "Clear Buffer
"
- if(!buffer2) temp_html += "
"
- temp_html += "Buffer 3:
"
- if(!(buffer3))
- temp_html += "Buffer Empty
"
- else
- temp_html += text("Data: []
", buffer3)
- temp_html += text("By: []
", buffer3owner)
- temp_html += text("Label: []
", buffer3label)
- if(viable_occupant) temp_html += "Save : UI - UI+UE - SE
"
- if(buffer3) temp_html += "Transfer to: Occupant - Injector
"
- //if(buffer3) temp_html += "Isolate Block
"
- if(buffer3) temp_html += "Disk: Save To | Load From
"
- if(buffer3) temp_html += "Edit Label
"
- if(buffer3) temp_html += "Clear Buffer
"
- if(!buffer3) temp_html += "
"
- temp_html += temp_footer_html
-
- if(viable_occupant && !scanner_status_html && occupant) //is there REALLY someone in there?
- scanner_status_html = "Health:
[occupant.health]%
Radiation Level:
[occupant.radiation]%
Rejuvenators:
[human_occupant.reagents.get_reagent_amount("inaprovaline")] units
Unique Enzymes :
[uppertext(occupant.dna.unique_enzymes)]
Unique Identifier:
[occupant.dna.uni_identity]
Structural Enzymes:
[occupant.dna.struc_enzymes]
Scanner Status
"
-
- var/occupant_status = "Scanner Unoccupied"
- if(occupant && occupant.dna) //is there REALLY someone in there?
- if(!istype(occupant,/mob/living/carbon/human))
- sleep(1)
- if(NOCLONE in occupant.mutations)
- occupant_status = "Invalid DNA structure"
- else
- switch(occupant.stat) // obvious, see what their status is
- if(0)
- occupant_status = "Conscious"
- if(1)
- occupant_status = "Unconscious"
- else
- occupant_status = "DEAD"
-
- occupant_status = "[occupant.name] => [occupant_status]
"
-
- dat += "[occupant_status][scanner_status_html]
"
-
- var/scanner_access_text = "Lock Scanner"
- if(scanner.locked)
- scanner_access_text = "Unlock Scanner"
-
- dat += "Scan "
-
- if(occupant && occupant.dna)
- dat += "[scanner_access_text] "
- if(human_occupant)
- dat += "Inject Rejuvenators
"
- else
- dat += "Inject Rejuvenators
"
- else
- dat += "[scanner_access_text] "
- dat += "Inject Rejuvenators
"
-
- if(!isnull(diskette))
- dat += "Eject Disk
"
-
- dat += "
"
-
- if(temp_html)
- dat += temp_html
-
- popup.set_content(dat)
- popup.open()
-*/
diff --git a/code/modules/computer3/computers/security.dm b/code/modules/computer3/computers/security.dm
deleted file mode 100644
index c3c05c11d19..00000000000
--- a/code/modules/computer3/computers/security.dm
+++ /dev/null
@@ -1,628 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-/obj/machinery/computer3/secure_data
- default_prog = /datum/file/program/secure_data
- spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/cardslot,/obj/item/part/computer/networking/radio)
- icon_state = "frame-sec"
-
-/obj/machinery/computer3/laptop/secure_data
- default_prog = /datum/file/program/secure_data
- spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/cardslot,/obj/item/part/computer/networking/radio)
- icon_state = "laptop"
-
-
-/datum/file/program/secure_data
- name = "Security Records"
- desc = "Used to view and edit personnel's security records"
- active_state = "security"
- image = 'icons/ntos/records.png'
-
- req_one_access = list(access_security, access_forensics_lockers)
-
- var/obj/item/weapon/card/id/scan = null
- var/obj/item/weapon/card/id/scan2 = null
- var/authenticated = null
- var/rank = null
- var/screen = null
- var/datum/data/record/active1 = null
- var/datum/data/record/active2 = null
- var/a_id = null
- var/temp = null
- var/printing = null
- var/can_change_id = 0
- var/list/Perp
- var/tempname = null
- //Sorting Variables
- var/sortBy = "name"
- var/order = 1 // -1 = Descending - 1 = Ascending
-
-
-
- proc/authenticate()
- if((access_security in scan.access) || (access_forensics_lockers in scan.access) )
- return 1
- if(istype(usr,/mob/living/silicon/ai))
- return 1
- return 0
-
- interact()
- if(!computer.cardslot)
- computer.Crash(MISSING_PERIPHERAL)
- return
- scan = computer.cardslot.reader
-
- if(computer.cardslot.dualslot)
- scan2 = computer.cardslot.writer
-
- if(!interactable())
- return
-
- if(is_away_level(computer.z))
- to_chat(usr, "Unable to establish a connection: You're too far away from the station!")
- return
- var/dat
-
- if(temp)
- dat = "[temp]
Clear Screen"
- else
- dat = text("Confirm Identity (R): []
", (scan ? text("[]", scan.name) : "----------"))
- if(computer.cardslot.dualslot)
- dat += text("Check Identity (W): []
", (scan2 ? text("[]", scan2.name) : "----------"))
- if(scan2 && !scan)
- dat += text("Insert card into reader slot to log in.
")
- if(authenticated)
- switch(screen)
- if(1.0)
- dat += {"
- "}
- dat += "Search Records
"
- dat += "New Record
"
- dat += {"
-
-
-
-
- | Name |
- ID |
- Rank |
- Fingerprints |
- Criminal Status |
-
"}
- if(!isnull(data_core.general))
- for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order))
- var/crimstat = ""
- for(var/datum/data/record/E in data_core.security)
- if((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
- crimstat = E.fields["criminal"]
- var/background
- switch(crimstat)
- if("*Arrest*")
- background = "'background-color:#DC143C;'"
- if("Incarcerated")
- background = "'background-color:#CD853F;'"
- if("Parolled")
- background = "'background-color:#CD853F;'"
- if("Released")
- background = "'background-color:#3BB9FF;'"
- if("None")
- background = "'background-color:#00FF00;'"
- if("")
- background = "'background-color:#00FF7F;'"
- crimstat = "No Record."
- dat += text("| [] | ", background, R, R.fields["name"])
- dat += text("[] | ", R.fields["id"])
- dat += text("[] | ", R.fields["rank"])
- dat += text("[] | ", R.fields["fingerprint"])
- dat += text("[] |
", crimstat)
- dat += "
"
- dat += "Record Maintenance
"
- dat += "{Log Out}"
- if(2.0)
- dat += "Records Maintenance
"
- dat += "
Delete All Records
Back"
- if(3.0)
- dat += "Security Record
"
- if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
- dat += text("")
- else
- dat += "General Record Lost!
"
- if((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
- dat += text("
\nSecurity Data
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", active2.fields["criminal"], active2.fields["mi_crim"], active2.fields["mi_crim_d"], active2.fields["ma_crim"], active2.fields["ma_crim_d"], decode(active2.fields["notes"]))
- var/counter = 1
- while(active2.fields[text("com_[]", counter)])
- dat += text("[]
Delete Entry
", active2.fields[text("com_[]", counter)], counter)
- counter++
- dat += "Add Entry
"
- dat += "Delete Record (Security Only)
"
- else
- dat += "Security Record Lost!
"
- dat += "New Security Record
"
- dat += "\nDelete Record (ALL)
\nPrint Record
\nBack
"
- if(4.0)
- if(!Perp.len)
- dat += "ERROR. String could not be located.
Back"
- else
- dat += {"
-
- "}
- dat += text("| Search Results for '[]': | ", tempname)
- dat += {"
-
-
-
-
- | Name |
- ID |
- Rank |
- Fingerprints |
- Criminal Status |
-
"}
- for(var/i=1, i<=Perp.len, i += 2)
- var/crimstat = ""
- var/datum/data/record/R = Perp[i]
- if(istype(Perp[i+1],/datum/data/record/))
- var/datum/data/record/E = Perp[i+1]
- crimstat = E.fields["criminal"]
- var/background
- switch(crimstat)
- if("*Arrest*")
- background = "'background-color:#DC143C;'"
- if("Incarcerated")
- background = "'background-color:#CD853F;'"
- if("Parolled")
- background = "'background-color:#CD853F;'"
- if("Released")
- background = "'background-color:#3BB9FF;'"
- if("None")
- background = "'background-color:#00FF7F;'"
- if("")
- background = "'background-color:#FFFFFF;'"
- crimstat = "No Record."
- dat += text("| [] | ", background, R, R.fields["name"])
- dat += text("[] | ", R.fields["id"])
- dat += text("[] | ", R.fields["rank"])
- dat += text("[] | ", R.fields["fingerprint"])
- dat += text("[] |
", crimstat)
- dat += "
"
- dat += "
Return to index."
- else
- else
- dat += "{Log In}"
- popup.width = 600
- popup.height = 400
- popup.set_content(dat)
- popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
- popup.open()
- return
-
-/*Revised /N
-I can't be bothered to look more of the actual code outside of switch but that probably needs revising too.
-What a mess.*/
- Topic(href, href_list)
- if(!interactable() || !computer.cardslot || ..(href,href_list))
- return
- if(!( data_core.general.Find(active1) ))
- active1 = null
- if(!( data_core.security.Find(active2) ))
- active2 = null
- switch(href_list["choice"])
-// SORTING!
- if("Sorting")
- // Reverse the order if clicked twice
- if(sortBy == href_list["sort"])
- if(order == 1)
- order = -1
- else
- order = 1
- else
- // New sorting order!
- sortBy = href_list["sort"]
- order = initial(order)
-//BASIC FUNCTIONS
- if("Clear Screen")
- temp = null
-
- if("Return")
- screen = 1
- active1 = null
- active2 = null
-
- if("Confirm Identity R")
- if(scan)
- if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
- computer.cardslot.remove(1)
- else
- scan.loc = get_turf(src)
- scan = null
- else
- var/obj/item/I = usr.get_active_hand()
- if(istype(I, /obj/item/weapon/card/id))
- computer.cardslot.insert(I, 1)
- scan = I
-
- if("Confirm Identity W")
- if(scan2)
- if(istype(usr,/mob/living/carbon/human) && !usr.get_active_hand())
- computer.cardslot.remove(2)
- else
- scan2.loc = get_turf(src)
- scan2 = null
- else
- var/obj/item/I = usr.get_active_hand()
- if(istype(I, /obj/item/weapon/card/id))
- computer.cardslot.insert(I, 2)
- scan2 = I
-
- if("Log Out")
- authenticated = null
- screen = null
- active1 = null
- active2 = null
-
- if("Log In")
- if(istype(usr, /mob/living/silicon/ai))
- src.active1 = null
- src.active2 = null
- src.authenticated = usr.name
- src.rank = "AI"
- src.screen = 1
- else if(istype(usr, /mob/living/silicon/robot))
- src.active1 = null
- src.active2 = null
- src.authenticated = usr.name
- var/mob/living/silicon/robot/R = usr
- src.rank = "[R.modtype] [R.braintype]"
- src.screen = 1
- else if(istype(scan, /obj/item/weapon/card/id))
- active1 = null
- active2 = null
- if(authenticate())
- authenticated = scan.registered_name
- rank = scan.assignment
- screen = 1
-//RECORD FUNCTIONS
- if("Search Records")
- var/t1 = input("Search String: (Partial Name or ID or Fingerprints or Rank)", "Secure. records", null, null) as text
- if((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || !interactable()))
- return
- Perp = new/list()
- t1 = lowertext(t1)
- var/list/components = splittext(t1, " ")
- if(components.len > 5)
- return //Lets not let them search too greedily.
- for(var/datum/data/record/R in data_core.general)
- var/temptext = R.fields["name"] + " " + R.fields["id"] + " " + R.fields["fingerprint"] + " " + R.fields["rank"]
- for(var/i = 1, i<=components.len, i++)
- if(findtext(temptext,components[i]))
- var/prelist = new/list(2)
- prelist[1] = R
- Perp += prelist
- for(var/i = 1, i<=Perp.len, i+=2)
- for(var/datum/data/record/E in data_core.security)
- var/datum/data/record/R = Perp[i]
- if((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
- Perp[i+1] = E
- tempname = t1
- screen = 4
-
- if("Record Maintenance")
- screen = 2
- active1 = null
- active2 = null
-
- if("Browse Record")
- var/datum/data/record/R = locate(href_list["d_rec"])
- var/S = locate(href_list["d_rec"])
- if(!( data_core.general.Find(R) ))
- temp = "Record Not Found!"
- else
- for(var/datum/data/record/E in data_core.security)
- if((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
- S = E
- active1 = R
- active2 = S
- screen = 3
-
-/* if("Search Fingerprints")
- var/t1 = input("Search String: (Fingerprint)", "Secure. records", null, null) as text
- if((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || (!interactable()) && (!istype(usr, /mob/living/silicon))))
- return
- active1 = null
- active2 = null
- t1 = lowertext(t1)
- for(var/datum/data/record/R in data_core.general)
- if(lowertext(R.fields["fingerprint"]) == t1)
- active1 = R
- if(!( active1 ))
- temp = text("Could not locate record [].", t1)
- else
- for(var/datum/data/record/E in data_core.security)
- if((E.fields["name"] == active1.fields["name"] || E.fields["id"] == active1.fields["id"]))
- active2 = E
- screen = 3 */
-
- if("Print Record")
- if(!( printing ))
- printing = 1
- var/datum/data/record/record1 = null
- var/datum/data/record/record2 = null
- if((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
- record1 = active1
- if((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
- record2 = active2
- sleep(50)
- var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( computer.loc )
- P.info = "Security Record
"
- if(record1)
- P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", record1.fields["name"], record1.fields["id"], record1.fields["sex"], record1.fields["age"], record1.fields["fingerprint"], record1.fields["p_stat"], record1.fields["m_stat"])
- P.name = text("Security Record ([])", record1.fields["name"])
- else
- P.info += "General Record Lost!
"
- P.name = "Security Record"
- if(record2)
- P.info += text("
\nSecurity Data
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", record2.fields["criminal"], record2.fields["mi_crim"], record2.fields["mi_crim_d"], record2.fields["ma_crim"], record2.fields["ma_crim_d"], decode(record2.fields["notes"]))
- var/counter = 1
- while(record2.fields[text("com_[]", counter)])
- P.info += text("[]
", record2.fields[text("com_[]", counter)])
- counter++
- else
- P.info += "Security Record Lost!
"
- P.info += ""
- printing = null
- computer.updateUsrDialog()
-//RECORD DELETE
- if("Delete All Records")
- temp = ""
- temp += "Are you sure you wish to delete all Security records?
"
- temp += "Yes
"
- temp += "No"
-
- if("Purge All Records")
- for(var/datum/data/record/R in data_core.security)
- qdel(R)
- temp = "All Security records deleted."
-
- if("Add Entry")
- if(!( istype(active2, /datum/data/record) ))
- return
- var/a2 = active2
- var/t1 = sanitize(copytext(input("Add Comment:", "Secure. records", null, null) as message,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
- return
- var/counter = 1
- while(active2.fields[text("com_[]", counter)])
- counter++
- active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
-
- if("Delete Record (ALL)")
- if(active1)
- temp = "Are you sure you wish to delete the record (ALL)?
"
- temp += "Yes
"
- temp += "No"
-
- if("Delete Record (Security)")
- if(active2)
- temp = "Are you sure you wish to delete the record (Security Portion Only)?
"
- temp += "Yes
"
- temp += "No"
-
- if("Delete Entry")
- if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
- active2.fields[text("com_[]", href_list["del_c"])] = "Deleted"
-//RECORD CREATE
- if("New Record (Security)")
- if((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) )))
- var/datum/data/record/R = new /datum/data/record()
- R.fields["name"] = active1.fields["name"]
- R.fields["id"] = active1.fields["id"]
- R.name = text("Security Record #[]", R.fields["id"])
- R.fields["criminal"] = "None"
- R.fields["mi_crim"] = "None"
- R.fields["mi_crim_d"] = "No minor crime convictions."
- R.fields["ma_crim"] = "None"
- R.fields["ma_crim_d"] = "No major crime convictions."
- R.fields["notes"] = "No notes."
- data_core.security += R
- active2 = R
- screen = 3
-
- if("New Record (General)")
- var/datum/data/record/G = new /datum/data/record()
- G.fields["name"] = "New Record"
- G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
- G.fields["rank"] = "Unassigned"
- G.fields["real_rank"] = "Unassigned"
- G.fields["sex"] = "Male"
- G.fields["age"] = "Unknown"
- G.fields["fingerprint"] = "Unknown"
- G.fields["p_stat"] = "Active"
- G.fields["m_stat"] = "Stable"
- G.fields["species"] = "Human"
- data_core.general += G
- active1 = G
- active2 = null
-
-//FIELD FUNCTIONS
- if("Edit Field")
- var/a1 = active1
- var/a2 = active2
- switch(href_list["field"])
- if("name")
- if(istype(active1, /datum/data/record))
- var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text
- if((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
- return
- active1.fields["name"] = t1
- if("id")
- if(istype(active2, /datum/data/record))
- var/t1 = sanitize(copytext(input("Please input id:", "Secure. records", active1.fields["id"], null) as text,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
- return
- active1.fields["id"] = t1
- if("fingerprint")
- if(istype(active1, /datum/data/record))
- var/t1 = sanitize(copytext(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null) as text,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
- return
- active1.fields["fingerprint"] = t1
- if("sex")
- if(istype(active1, /datum/data/record))
- if(active1.fields["sex"] == "Male")
- active1.fields["sex"] = "Female"
- else
- active1.fields["sex"] = "Male"
- if("age")
- if(istype(active1, /datum/data/record))
- var/t1 = input("Please input age:", "Secure. records", active1.fields["age"], null) as num
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
- return
- active1.fields["age"] = t1
- if("mi_crim")
- if(istype(active2, /datum/data/record))
- var/t1 = sanitize(copytext(input("Please input minor crimes list:", "Secure. records", active2.fields["mi_crim"], null) as text,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
- return
- active2.fields["mi_crim"] = t1
- if("mi_crim_d")
- if(istype(active2, /datum/data/record))
- var/t1 = sanitize(copytext(input("Please summarize minor crimes:", "Secure. records", active2.fields["mi_crim_d"], null) as message,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
- return
- active2.fields["mi_crim_d"] = t1
- if("ma_crim")
- if(istype(active2, /datum/data/record))
- var/t1 = sanitize(copytext(input("Please input major crimes list:", "Secure. records", active2.fields["ma_crim"], null) as text,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
- return
- active2.fields["ma_crim"] = t1
- if("ma_crim_d")
- if(istype(active2, /datum/data/record))
- var/t1 = sanitize(copytext(input("Please summarize major crimes:", "Secure. records", active2.fields["ma_crim_d"], null) as message,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
- return
- active2.fields["ma_crim_d"] = t1
- if("notes")
- if(istype(active2, /datum/data/record))
- var/t1 = trim(sanitize(copytext(input("Please summarize minor crimes:", "Secure. records", active2.fields["mi_crim_d"], null) as message,1,MAX_MESSAGE_LEN)))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active2 != a2))
- return
- active2.fields["notes"] = t1
- if("criminal")
- if(istype(active2, /datum/data/record))
- temp = "Criminal Status:
"
- temp += ""
- if("rank")
- var/list/L = list( "Head of Personnel", "Captain", "AI" )
- //This was so silly before the change. Now it actually works without beating your head against the keyboard. /N
- if((istype(active1, /datum/data/record) && L.Find(rank)))
- temp = "Rank:
"
- temp += ""
- for(var/rank in joblist)
- temp += "- [rank]
"
- temp += "
"
- else
- alert(usr, "You do not have the required rank to do this!")
- if("species")
- if(istype(active1, /datum/data/record))
- var/t1 = sanitize(copytext(input("Please enter race:", "General records", active1.fields["species"], null) as message,1,MAX_MESSAGE_LEN))
- if((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!interactable() && (!istype(usr, /mob/living/silicon))) || active1 != a1))
- return
- active1.fields["species"] = t1
-
-//TEMPORARY MENU FUNCTIONS
- else//To properly clear as per clear screen.
- temp=null
- switch(href_list["choice"])
- if("Change Rank")
- if(active1)
- active1.fields["rank"] = href_list["rank"]
- if(href_list["rank"] in joblist)
- active1.fields["real_rank"] = href_list["real_rank"]
-
- if("Change Criminal Status")
- if(active2)
-
- switch(href_list["criminal2"])
- if("none")
- active2.fields["criminal"] = "None"
- if("arrest")
- active2.fields["criminal"] = "*Arrest*"
- if("incarcerated")
- active2.fields["criminal"] = "Incarcerated"
- if("parolled")
- active2.fields["criminal"] = "Parolled"
- if("released")
- active2.fields["criminal"] = "Released"
- for(var/mob/living/carbon/human/H in mob_list)
- H.sec_hud_set_security_status()
-
- if("Delete Record (Security) Execute")
- if(active2)
- qdel(active2)
-
- if("Delete Record (ALL) Execute")
- if(active1)
- for(var/datum/data/record/R in data_core.medical)
- if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
- qdel(R)
- else
- qdel(active1)
- if(active2)
- qdel(active2)
- else
- temp = "This function does not appear to be working at the moment. Our apologies."
-
- //computer.updateUsrDialog()
- interact()
- return
-
-/obj/machinery/computer3/secure_data/emp_act(severity)
- if(stat & (BROKEN|NOPOWER))
- ..(severity)
- return
-
- for(var/datum/data/record/R in data_core.security)
- if(prob(10/severity))
- switch(rand(1,6))
- if(1)
- R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]"
- if(2)
- R.fields["sex"] = pick("Male", "Female")
- if(3)
- R.fields["age"] = rand(5, 85)
- if(4)
- R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released")
- if(5)
- R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
- if(6)
- R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable")
- continue
-
- else if(prob(1))
- qdel(R)
- continue
-
- ..(severity)
-
-/obj/machinery/computer3/secure_data/detective_computer
- icon = 'icons/obj/computer.dmi'
- icon_state = "messyfiles"
diff --git a/code/modules/computer3/computers/station_alert.dm b/code/modules/computer3/computers/station_alert.dm
deleted file mode 100644
index 82c57cc7ee5..00000000000
--- a/code/modules/computer3/computers/station_alert.dm
+++ /dev/null
@@ -1,96 +0,0 @@
-/obj/machinery/computer3/station_alert
- default_prog = /datum/file/program/station_alert
- spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/networking/radio)
- icon_state = "frame-eng"
-
-
-/datum/file/program/station_alert
- name = "Station Alert Console"
- desc = "Used to access the station's automated alert system."
- active_state = "alert:0"
- var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
-
- interact(mob/user)
- if(!interactable())
- return
- var/dat = "Current Station Alerts\n"
- dat += "Close
"
- for(var/cat in src.alarms)
- dat += text("[]
\n", cat)
- var/list/L = src.alarms[cat]
- if(L.len)
- for(var/alarm in L)
- var/list/alm = L[alarm]
- var/area/A = alm[1]
- var/list/sources = alm[3]
- dat += ""
- dat += "• "
- dat += "[A.name]"
- if(sources.len > 1)
- dat += text(" - [] sources", sources.len)
- dat += "
\n"
- else
- dat += "-- All Systems Nominal
\n"
- dat += "
\n"
- //user << browse(dat, "window=alerts")
- //onclose(user, "alerts")
- popup.set_content(dat)
- popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
- popup.open()
- return
-
-
- Topic(href, href_list)
- if(..())
- return
- return
-
-
- proc/triggerAlarm(var/class, area/A, var/O, var/alarmsource)
- var/list/L = src.alarms[class]
- for(var/I in L)
- if(I == A.name)
- var/list/alarm = L[I]
- var/list/sources = alarm[3]
- if(!(alarmsource in sources))
- sources += alarmsource
- return 1
- var/obj/machinery/camera/C = null
- var/list/CL = null
- if(O && istype(O, /list))
- CL = O
- if(CL.len == 1)
- C = CL[1]
- else if(O && istype(O, /obj/machinery/camera))
- C = O
- L[A.name] = list(A, (C) ? C : O, list(alarmsource))
- return 1
-
-
- proc/cancelAlarm(var/class, area/A as area, obj/origin)
- var/list/L = src.alarms[class]
- var/cleared = 0
- for(var/I in L)
- if(I == A.name)
- var/list/alarm = L[I]
- var/list/srcs = alarm[3]
- if(origin in srcs)
- srcs -= origin
- if(srcs.len == 0)
- cleared = 1
- L -= I
- return !cleared
-
-
-
- process()
- var/active_alarms = 0
- for(var/cat in src.alarms)
- var/list/L = src.alarms[cat]
- if(L.len) active_alarms = 1
- if(active_alarms)
- active_state = "alert:2"
- else
- active_state = "alert:0"
- ..()
- return
diff --git a/code/modules/computer3/computers/welcome.dm b/code/modules/computer3/computers/welcome.dm
deleted file mode 100644
index 203c5922289..00000000000
--- a/code/modules/computer3/computers/welcome.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-/obj/machinery/computer3/laptop/vended
- default_prog = /datum/file/program/welcome
-
-
-/datum/file/program/welcome
- name = "Welcome Screen"
- desc = "First time boot splash screen"
- active_state = "osod"
- image = 'icons/ntos/program.png'
-
-
- interact()
- if(!interactable())
- return
- var/dat = ""
- dat += "Welcome to NTOS"
- dat += "Thank you for choosing NTOS, your gateway to the future of mobile computing technology, sponsored by Nanotrasen (R)
"
- dat += "Getting started with NTOS:
"
- dat += "To leave a current program, click the X button in the top right corner of the window. This will return you to the NTOS desktop. \
- From the desktop, you can open the hard drive, usually located in the top left corner to access all the programs installed on your computer. \
- When you rented your laptop, you were supplied with programs that your Nanotrasen Issued ID has given you access to use. \
- In the event of a serious error, the right click menu will give you the ability to reset your computer. To open and close your laptop, alt-click your device.\
- If you have any questions or technical issues, please contact your local computer technical experts at your local Central Command."
- popup.set_content(dat)
- popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
- popup.open()
- return
-
- Topic(href, href_list)
- if(!interactable() || ..(href,href_list))
- return
- interact()
- return
\ No newline at end of file
diff --git a/code/modules/computer3/file.dm b/code/modules/computer3/file.dm
deleted file mode 100644
index 1cbb363894a..00000000000
--- a/code/modules/computer3/file.dm
+++ /dev/null
@@ -1,165 +0,0 @@
-// I am deciding that for sayustation's purposes directories are right out,
-// we can't even get backpacks to work right with recursion, and that
-// actually fucking matters. Metadata too, that can be added if ever needed.
-
-/*
- Files are datums that can be stored in digital storage devices
-*/
-
-/datum/file
- var/name = "File"
- var/extension = "dat"
- var/volume = 10 // in KB
- var/image = 'icons/ntos/file.png' // determines the icon to use, found in icons/ntos
- var/obj/machinery/computer3/computer // the parent computer, if fixed
- var/obj/item/part/computer/storage/device // the device that is containing this file
- var/hidden_file = 0 // Prevents file from showing up on NTOS program list.
- var/drm = 0 // Copy protection, called by copy() and move()
- var/readonly = 0 // Edit protection, called by edit(), which is just a failcheck proc
-
- proc/execute(var/datum/file/source)
- return
-
- //
- // Copy file to device.
- // If you overwrite this function, use the return value to make sure it succeeded
- //
- proc/copy(var/obj/item/part/computer/storage/dest)
- if(!computer || computer.crit_fail) return null
- if(drm)
- if(!computer.emagged)
- return null
- var/datum/file/F = new type()
- if(!dest.addfile(F))
- return null // todo: arf here even though the player can't do a damn thing due to concurrency
- return F
-
- //
- // Move file to device
- // Returns null on failure even though the existing file doesn't go away
- //
- proc/move(var/obj/item/part/computer/storage/dest)
- if(!computer || computer.crit_fail) return null
- if(drm)
- if(!computer.emagged)
- return null
- var/obj/item/part/computer/storage/current = device
- if(!dest.addfile(src))
- return null
- current.removefile(src)
- return src
-
- //
- // Determines if the file is editable. This does not use the DRM flag,
- // but instead the readonly flag.
- //
-
- proc/edit()
- if(!computer || computer.crit_fail)
- return 0
- if(readonly && !computer.emagged)
- return 0 //
- return 1
-
-/*
- Centcom root authorization certificate
-
- Non-destructive, officially sanctioned.
- Has the same effect on computers as an emag.
-*/
-/datum/file/centcom_auth
- name = "Centcom Root Access Token"
- extension = "auth"
- volume = 100
- copy()
- return null
-
-/*
- A file that contains information
-*/
-
-/datum/file/data
-
- var/content = "content goes here"
- var/file_increment = 1
- var/binary = 0 // determines if the file can't be opened by editor
-
- // Set the content to a specific amount, increase filesize appropriately.
- proc/set_content(var/text)
- content = text
- if(file_increment > 1)
- volume = round(file_increment * length(text))
-
- copy(var/obj/O)
- var/datum/file/data/D = ..(O)
- if(D)
- D.content = content
- D.readonly = readonly
-
- New()
- if(content)
- if(file_increment > 1)
- volume = round(file_increment * length(content))
-
-/*
- A generic file that contains text
-*/
-
-/datum/file/data/text
- name = "Text File"
- extension = "txt"
- image = 'icons/ntos/file.png'
- content = ""
- file_increment = 0.002 // 0.002 kilobytes per character (1024 characters per KB)
-
-/datum/file/data/text/ClownProphecy
- name = "Clown Prophecy"
- content = "HONKhHONKeHONKlHONKpHONKHONmKHONKeHONKHONKpHONKlHONKeHONKaHONKsHONKe"
-
-
-/*
- A file that contains research
-*/
-
-/datum/file/data/research
- name = "Untitled Research"
- binary = 1
- content = "Untitled Tier X Research"
- var/datum/tech/stored // the actual tech contents
- volume = 1440
-
-/*
- A file that contains genetic information
-*/
-
-/datum/file/data/genome
- name = "Genetic Buffer"
- binary = 1
- var/real_name = "Poop"
-
-
-/datum/file/data/genome/SE
- name = "Structural Enzymes"
-
-/datum/file/data/genome/UE
- name = "Unique Enzymes"
-
-/*
-the way genome computers now work, a subtype is the wrong way to do this;
-it will no longer be picked up. You can change this later if you need to.
-for now put it on a disk
-
-/datum/file/data/genome/UE/GodEmperorOfMankind
- name = "G.E.M.K."
- content = "066000033000000000AF00330660FF4DB002690"
- label = "God Emperor of Mankind"
-*/
-/datum/file/data/genome/UI
- name = "Unique Identifier"
-
-/datum/file/data/genome/UI/UE
- name = "Unique Identifier + Unique Enzymes"
-
-/datum/file/data/genome/cloning
- name = "Cloning Data"
- var/datum/data/record/record
diff --git a/code/modules/computer3/laptop.dm b/code/modules/computer3/laptop.dm
deleted file mode 100644
index 1eaf28de60d..00000000000
--- a/code/modules/computer3/laptop.dm
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- Computer3 portable computer.
-
- Battery powered only; it does not use the APC network at all.
-
- When picked up, becomes an inert item. This item can be put in a recharger,
- or set down and re-opened into the original machine. While closed, the computer
- has the MAINT stat flag. If you want to ignore this, you will have to bitmask it out.
-
- The unused(?) alt+click will toggle laptops open and closed. If we find a better
- answer for this in the future, by all means use it. I just don't want it limited
- to the verb, which is SIGNIFICANTLY less accessible than shutting a laptop.
- Ctrl-click would work for closing the machine, since it's anchored, but not for
- opening it back up again. And obviously, I don't want to override shift-click.
- There's no double-click because that's used in regular click events. Alt-click is the
- only obvious one left.
-*/
-
-
-/obj/item/device/laptop
- name = "Laptop Computer"
- desc = "A clamshell portable computer. It is closed."
- icon = 'icons/obj/computer3.dmi'
- icon_state = "laptop-closed"
- item_state = "laptop-inhand"
- pixel_x = 2
- pixel_y = -3
- w_class = 3
-
- var/obj/machinery/computer3/laptop/stored_computer = null
-
- verb/open_computer()
- set name = "Open Laptop"
- set category = "Object"
- set src in view(1)
-
- if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
- to_chat(usr, "You can't do that.")
- return
-
- if(!Adjacent(usr))
- to_chat(usr, "You can't reach it.")
- return
-
- if(!istype(loc,/turf))
- to_chat(usr, "[src] is too bulky! You'll have to set it down.")
- return
-
- if(!stored_computer)
- if(contents.len)
- for(var/obj/O in contents)
- O.forceMove(loc)
- to_chat(usr, "\The [src] crumbles to pieces.")
- spawn(5)
- qdel(src)
- return
-
- if(!stored_computer.manipulating)
- stored_computer.manipulating = 1
- stored_computer.loc = loc
- stored_computer.stat &= ~MAINT
- stored_computer.update_icon()
- loc = null
- to_chat(usr, "You open \the [src].")
-
- spawn(5)
- stored_computer.manipulating = 0
- qdel(src)
- else
- to_chat(usr, "You are already opening the computer!")
-
-
- AltClick()
- if(Adjacent(usr))
- open_computer()
-
- Destroy()
- ..()
- return QDEL_HINT_HARDDEL_NOW // Warning: GC'ing will cause the laptop to vanish when it next closes
-
-//Quickfix until Snapshot works out how he wants to redo power. ~Z
-/obj/item/device/laptop/verb/eject_id()
- set category = null
- set name = "Eject ID Card"
- set src in oview(1)
-
- if(stored_computer)
- stored_computer.eject_id()
-
-/obj/machinery/computer3/laptop/verb/eject_id()
- set category = null
- set name = "Eject ID Card"
- set src in oview(1)
-
- var/obj/item/part/computer/cardslot/C = locate() in src.contents
-
- if(!C)
- to_chat(usr, "There is no card port on the laptop.")
- return
-
- var/obj/item/weapon/card/id/card
- if(C.reader)
- card = C.reader
- C.remove_reader(usr)
- else if(C.writer)
- card = C.writer
- C.remove_writer(usr)
- else
- to_chat(usr, "There is nothing to remove from the laptop card port.")
- return
-
- to_chat(usr, "You remove [card] from the laptop.")
-
-
-/obj/machinery/computer3/laptop
- name = "Laptop Computer"
- desc = "A clamshell portable computer. It is open."
-
- icon_state = "laptop"
- density = 0
- pixel_x = 2
- pixel_y = -3
- show_keyboard = 0
-
- var/manipulating = 0 // To prevent disappearing bug
- var/obj/item/device/laptop/portable = null
-
- New(var/L, var/built = 0)
- if(!built && !battery)
- battery = new /obj/item/weapon/stock_parts/cell(src)
- ..(L,built)
-
- verb/close_computer()
- set name = "Close Laptop"
- set category = "Object"
- set src in view(1)
-
- if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
- to_chat(usr, "You can't do that.")
- return
-
- if(!Adjacent(usr))
- to_chat(usr, "You can't reach it.")
- return
-
- if(istype(loc,/obj/item/device/laptop))
- testing("Close closed computer")
- return
- if(!istype(loc,/turf))
- testing("Odd computer location: [loc] - close laptop")
- return
-
- if(stat&BROKEN)
- to_chat(usr, "\The [src] is broken! You can't quite get it closed.")
- return
-
- if(!portable)
- portable = new
- portable.stored_computer = src
-
- if(!manipulating)
- portable.forceMove(loc)
- forceMove(portable)
- stat |= MAINT
- to_chat(usr, "You close \the [src].")
-
- auto_use_power()
- if(stat&MAINT)
- return
- if(use_power && istype(battery) && battery.charge > 0)
- if(use_power == 1)
- battery.use(idle_power_usage)
- else
- battery.use(active_power_usage)
- return 1
- return 0
-
- use_power(var/amount, var/chan = -1)
- if(battery && battery.charge > 0)
- battery.use(amount)
-
- power_change()
- if( !battery || battery.charge <= 0 )
- stat |= NOPOWER
- else
- stat &= ~NOPOWER
-
- Destroy()
- if(istype(loc,/obj/item/device/laptop))
- var/obj/O = loc
- spawn(5)
- if(O)
- qdel(O)
- return ..()
-
-
- AltClick()
- if(Adjacent(usr))
- close_computer()
diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm
deleted file mode 100644
index e77298dc35e..00000000000
--- a/code/modules/computer3/lapvend.dm
+++ /dev/null
@@ -1,420 +0,0 @@
-/obj/machinery/lapvend
- name = "laptop vendor"
- desc = "A generic vending machine."
- icon = 'icons/obj/vending.dmi'
- icon_state = "robotics"
- layer = 2.9
- anchored = 1
- density = 1
- var/datum/browser/popup = null
- var/obj/machinery/computer3/laptop/vended/newlap = null
- var/obj/item/device/laptop/relap = null
- var/vendmode = 0
-
-
- var/cardreader = 0
- var/floppy = 0
- var/radionet = 0
- var/camera = 0
- var/network = 0
- var/power = 0
-
-
-/obj/machinery/lapvend/New()
- ..()
- spawn(4)
- power_change()
- return
- return
-
-
-/obj/machinery/lapvend/blob_act()
- if(prob(50))
- spawn(0)
- qdel(src)
- return
-
- return
-
-
-/obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- if(vendmode == 1)
- if(istype(W, /obj/item/weapon/card))
- var/obj/item/weapon/card/I = W
- scan_card(I)
- vendmode = 0
- if(vendmode == 3)
- if(istype(W,/obj/item/weapon/card))
- var/obj/item/weapon/card/I = W
- reimburse(I)
- vendmode = 0
- if(vendmode == 0)
- if(istype(W, /obj/item/device/laptop))
- var/obj/item/device/laptop/L = W
- relap = L
- calc_reimburse(L)
- usr.drop_item()
- L.loc = src
- vendmode = 3
- to_chat(usr, "You slot your [L.name] into \The [src.name]")
- else
- ..()
-
-
-/obj/machinery/lapvend/attack_hand(mob/user)
- if(..())
- return 1
- interact(user)
-
-/obj/machinery/lapvend/attack_ghost(mob/user)
- interact(user)
-
-/obj/machinery/lapvend/interact(mob/user)
- user.set_machine(src)
- var/vendorname = (src.name) //import the machine's name
- var/dat = "[vendorname]
" //display the name, and added a horizontal rule
- if(vendmode == 0)
- dat += "Please choose your laptop customization options
"
- dat += "Your comptuer will automatically be loaded with any programs you can use after the transaction is complete."
- dat += "Some programs will require additional components to be installed!
"
- dat += "HDD (Required) : Added
"
- dat += "Card Reader : Single (50) | Dual (125)
"
- dat += "Floppy Drive: Add (50)
"
- dat += "Radio Network card Add (50)
"
- dat += "Camera Card Add (100)
"
- dat += " Network card Area (75) Adjacent (50)Powernet (25)
"
- dat += "
Power source upgrade Extended (175) Unreal (250)"
-
- if(vendmode == 0 || vendmode == 1)
- dat += "
Cart
"
- dat += "Total: [total()]
"
- if(cardreader == 1)
- dat += "Card Reader: (single) (50)
"
- else if(cardreader == 2)
- dat += "Card Reader: (double) (125)
"
- else
- dat += "Card Reader: None
"
- if(floppy == 0)
- dat += "Floppy Drive: None
"
- else
- dat += "Floppy Drive: Added (50)
"
- if(radionet == 1)
- dat += "Radio Card: Added (50)
"
- else
- dat += "Radio Card: None
"
- if(camera == 1)
- dat += "Camera Card: Added (100)
"
- else
- dat += "Camera Card: None
"
- if(network == 1)
- dat += "Network card: Area (75)
"
- else if(network == 2)
- dat += "Network card: Adjacent (50)
"
- else if(network == 3)
- dat += "Network card: Powernet (25)
"
- else
- dat += "Network card: None
"
- if(power == 0)
- dat += "Power source: Regular
"
- else if(power == 1)
- dat += "Power source: Extended (175)
"
- else
- dat += "Power source: Unreal (250)
"
-
- if(vendmode == 0)
- dat += "
Vend Laptop"
-
- if(vendmode == 1)
- dat += "Please swipe your card to complete the transaction"
-
- if(vendmode == 3)
- dat += "Please swipe your card to finish returning your computer
"
- dat += "Cancel"
-
-
-
-
- popup = new(user, "lapvend", name, 450, 500)
- popup.set_content(dat)
- popup.open()
- return
-
-
-/obj/machinery/lapvend/Topic(href, href_list)
- if(..())
- return 1
-
- usr.set_machine(src)
- switch(href_list["choice"])
- if("single_add")
- cardreader = 1
- if("dual_add")
- cardreader = 2
- if("floppy_add")
- floppy = 1
- if("radio_add")
- radionet = 1
- if("camnet_add")
- camera = 1
- if("area_add")
- network = 1
- if("prox_add")
- network = 2
- if("cable_add")
- network = 3
- if("high_add")
- power = 1
- if("super_add")
- power = 2
-
- if("single_rem" || "dual_rem")
- cardreader = 0
- if("floppy_rem")
- floppy = 0
- if("radio_rem")
- radionet = 0
- if("camnet_rem")
- camera = 0
- if("area_rem" || "prox_rem" || "cable_rem")
- network = 0
- if("high_rem" || "super_rem")
- power = 0
-
- if("vend")
- vendmode = 1
-
- if("cancel")
- relap.loc = src.loc
- relap = null
- vendmode = 0
-
- src.updateUsrDialog()
- return
-
-
-/obj/machinery/lapvend/proc/vend()
- if(cardreader > 0)
- if(cardreader == 1)
- newlap.spawn_parts += (/obj/item/part/computer/cardslot)
- else
- newlap.spawn_parts += (/obj/item/part/computer/cardslot/dual)
- if(floppy == 1)
- newlap.spawn_parts += (/obj/item/part/computer/storage/removable)
- if(radionet == 1)
- newlap.spawn_parts += (/obj/item/part/computer/networking/radio)
- if(camera == 1)
- newlap.spawn_parts += (/obj/item/part/computer/networking/cameras)
- if(network == 1)
- newlap.spawn_parts += (/obj/item/part/computer/networking/area)
- if(network == 2)
- newlap.spawn_parts += (/obj/item/part/computer/networking/prox)
- if(network == 3)
- newlap.spawn_parts += (/obj/item/part/computer/networking/cable)
- if(power == 1)
- qdel(newlap.battery)
- newlap.battery = new /obj/item/weapon/stock_parts/cell/high(newlap)
- if(power == 2)
- qdel(newlap.battery)
- newlap.battery = new /obj/item/weapon/stock_parts/cell/super(newlap)
-
- newlap.spawn_parts()
-
-/obj/machinery/lapvend/proc/scan_card(var/obj/item/weapon/card/I)
- if(istype(I, /obj/item/weapon/card/id))
- var/obj/item/weapon/card/id/C = I
- visible_message("[usr] swipes a card through [src].")
- if(vendor_account)
- var/datum/money_account/D = attempt_account_access_nosec(C.associated_account_number)
- if(D && D.security_level)
- var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
- D = attempt_account_access(C.associated_account_number, attempt_pin, 2)
- if(D)
- var/transaction_amount = total()
- if(transaction_amount <= D.money)
-
- //transfer the money
- D.money -= transaction_amount
- vendor_account.money += transaction_amount
-
- //Transaction logs
- var/datum/transaction/T = new()
- T.target_name = "[vendor_account.owner_name] (via [src.name])"
- T.purpose = "Purchase of Laptop"
- if(transaction_amount > 0)
- T.amount = "([transaction_amount])"
- else
- T.amount = "[transaction_amount]"
- T.source_terminal = src.name
- T.date = current_date_string
- T.time = worldtime2text()
- D.transaction_log.Add(T)
- //
- T = new()
- T.target_name = D.owner_name
- T.purpose = "Purchase of Laptop"
- T.amount = "[transaction_amount]"
- T.source_terminal = src.name
- T.date = current_date_string
- T.time = worldtime2text()
- vendor_account.transaction_log.Add(T)
-
- newlap = new /obj/machinery/computer3/laptop/vended(src.loc)
-
- choose_progs(C)
- vend()
- popup.close()
- newlap.close_computer()
- newlap = null
- cardreader = 0
- floppy = 0
- radionet = 0
- camera = 0
- network = 0
- power = 0
- else
- to_chat(usr, "[bicon(src)]You don't have that much money!")
- else
- to_chat(usr, "[bicon(src)]Unable to access account. Check security settings and try again.")
- else
- to_chat(usr, "[bicon(src)]Unable to access vendor account. Please record the machine ID and call CentComm Support.")
-
-/obj/machinery/lapvend/proc/total()
- var/total = 0
-
- if(cardreader == 1)
- total += 50
- if(cardreader == 2)
- total += 125
- if(floppy == 1)
- total += 50
- if(radionet == 1)
- total += 50
- if(camera == 1)
- total += 100
- if(network == 1)
- total += 75
- if(network == 2)
- total += 50
- if(network == 3)
- total += 25
- if(power == 1)
- total += 175
- if(power == 2)
- total += 250
-
- return total
-
-/obj/machinery/lapvend/proc/choose_progs(var/obj/item/weapon/card/id/C)
- if((access_security in C.access) || (access_forensics_lockers in C.access))
- newlap.spawn_files += (/datum/file/program/secure_data)
- newlap.spawn_files += (/datum/file/camnet_key)
- newlap.spawn_files += (/datum/file/camnet_key/researchoutpost)
- newlap.spawn_files += (/datum/file/camnet_key/miningoutpost)
- newlap.spawn_files += (/datum/file/camnet_key/telecomms)
- newlap.spawn_files += (/datum/file/program/security)
- if(access_armory in C.access)
- newlap.spawn_files += (/datum/file/program/prisoner)
- if(access_atmospherics in C.access)
- newlap.spawn_files += (/datum/file/program/atmos_alert)
- if(access_change_ids in C.access)
- newlap.spawn_files += (/datum/file/program/card_comp)
- if(access_heads in C.access)
- newlap.spawn_files += (/datum/file/program/communications)
- if((access_medical in C.access) || (access_forensics_lockers in C.access)) //Gives detective the medical records program, but not the crew monitoring one.
- newlap.spawn_files += (/datum/file/program/med_data)
- if(access_medical in C.access)
- newlap.spawn_files += (/datum/file/program/crew)
- if(access_engine in C.access)
- newlap.spawn_files += (/datum/file/program/powermon)
- if(access_research in C.access)
- newlap.spawn_files += (/datum/file/camnet_key/researchoutpost)
- newlap.spawn_files += (/datum/file/camnet_key/research)
- newlap.spawn_files += (/datum/file/camnet_key/anomalyisolation)
- newlap.spawn_files += (/datum/file/camnet_key/toxins)
- newlap.spawn_files += (/datum/file/camnet_key/telepad)
-/* if(access_rd in C.access)
- newlap.spawn_files += (/datum/file/program/borg_control) */
- if(access_cent_specops in C.access)
- newlap.spawn_files += (/datum/file/camnet_key/ert)
- newlap.spawn_files += (/datum/file/camnet_key/centcom)
- newlap.spawn_files += (/datum/file/camnet_key/thunderdome)
- newlap.spawn_files += (/datum/file/program/arcade)
- newlap.spawn_files += (/datum/file/camnet_key/entertainment)
- //Atlantis: Each laptop gets "invisible" program/security - REQUIRED for camnetkeys to work.
- newlap.spawn_files += (/datum/file/program/security/hidden)
- newlap.update_spawn_files()
-
-/obj/machinery/lapvend/proc/calc_reimburse(var/obj/item/device/laptop/L)
- if(istype(L.stored_computer.cardslot,/obj/item/part/computer/cardslot))
- cardreader = 1
- if(istype(L.stored_computer.cardslot,/obj/item/part/computer/cardslot/dual))
- cardreader = 2
- if(istype(L.stored_computer.floppy,/obj/item/part/computer/storage/removable))
- floppy = 1
- if(istype(L.stored_computer.radio,/obj/item/part/computer/networking/radio))
- radionet = 1
- if(istype(L.stored_computer.camnet,/obj/item/part/computer/networking/cameras))
- camera = 1
- if(istype(L.stored_computer.net,/obj/item/part/computer/networking/area))
- network = 1
- if(istype(L.stored_computer.net,/obj/item/part/computer/networking/prox))
- network = 2
- if(istype(L.stored_computer.net,/obj/item/part/computer/networking/cable))
- network = 3
- if(istype(L.stored_computer.battery, /obj/item/weapon/stock_parts/cell/high))
- power = 1
- if(istype(L.stored_computer.battery, /obj/item/weapon/stock_parts/cell/super))
- power = 2
-
-
-
-/obj/machinery/lapvend/proc/reimburse(var/obj/item/weapon/card/I)
- if(istype(I, /obj/item/weapon/card/id))
- var/obj/item/weapon/card/id/C = I
- visible_message("[usr] swipes a card through [src].")
- if(vendor_account)
- var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
- var/datum/money_account/D = attempt_account_access(C.associated_account_number, attempt_pin, 2)
- if(D)
- var/transaction_amount = total()
-
- //transfer the money
- D.money += transaction_amount
- vendor_account.money -= transaction_amount
-
- //Transaction logs
- var/datum/transaction/T = new()
- T.target_name = "[vendor_account.owner_name] (via [src.name])"
- T.purpose = "Return purchase of Laptop"
- if(transaction_amount > 0)
- T.amount = "([transaction_amount])"
- else
- T.amount = "[transaction_amount]"
- T.source_terminal = src.name
- T.date = current_date_string
- T.time = worldtime2text()
- D.transaction_log.Add(T)
- //
- T = new()
- T.target_name = D.owner_name
- T.purpose = "Return purchase of Laptop"
- T.amount = "[transaction_amount]"
- T.source_terminal = src.name
- T.date = current_date_string
- T.time = worldtime2text()
- vendor_account.transaction_log.Add(T)
-
- qdel(relap)
-
- vendmode = 0
- cardreader = 0
- floppy = 0
- radionet = 0
- camera = 0
- network = 0
- power = 0
-
- else
- to_chat(usr, "[bicon(src)]Unable to access account. Check security settings and try again.")
- else
- to_chat(usr, "[bicon(src)]Unable to access vendor account. Please record the machine ID and call CentComm Support.")
diff --git a/code/modules/computer3/networking.dm b/code/modules/computer3/networking.dm
deleted file mode 100644
index f55a63b0718..00000000000
--- a/code/modules/computer3/networking.dm
+++ /dev/null
@@ -1,235 +0,0 @@
-/obj/item/part/computer/networking
- name = "Computer networking component"
-
- /*
- This is the public-facing proc used by NETUP.
- It does additional checking before and after calling get_machines()
-
- */
- proc/connect_to(var/typekey,var/atom/previous)
- if(!computer || computer.stat)
- return null
-
- if(istype(previous,typekey) && verify_machine(previous))
- return previous
-
- var/result = get_machines(typekey)
-
- if(!result)
- return null
-
- if(islist(result))
- var/list/R = result
- if(R.len == 0)
- return null
- else if(R.len == 1)
- return R[1]
- else
- var/list/atomlist = computer.format_atomlist(R)
- result = input("Select:","Multiple destination machines located",atomlist[1]) as null|anything in atomlist
- return atomlist[result]
-
- if(isobj(result))
- return result
-
- return null // ?
-
- /*
- This one is used to determine the candidate machines.
- It may return an object, a list of objects, or null.
-
- Overwite this on any networking component.
- */
- proc/get_machines(var/typekey)
- return list()
-
- /*
- This is used to verify that an existing machine is within the network.
- Calling NETUP() with an object argument will run this check, and if
- the object is still accessible, it will be used. Otherwise, another
- search will be run.
-
- Overwrite this on any networking component.
- */
- proc/verify_machine(var/obj/previous)
- return 0
-
-/*
- Provides radio/signaler functionality, and also
- network-connects to anything on the same z-level
- which is tuned to the same frequency.
-*/
-/obj/item/part/computer/networking/radio
- name = "Wireless networking component"
- desc = "Radio module for computers"
-
- var/datum/radio_frequency/radio_connection = null
- var/frequency = 1459
- var/filter = null
- var/range = null
- var/subspace = 0
-
- init()
- ..()
- spawn(5)
- radio_connection = radio_controller.add_object(src, src.frequency, src.filter)
-
- proc/set_frequency(new_frequency)
- if(radio_controller)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- radio_connection = radio_controller.add_object(src, frequency, filter)
- else
- frequency = new_frequency
- spawn(rand(5,10))
- set_frequency(new_frequency)
-
- receive_signal(var/datum/signal/signal)
- if(!signal || !computer || (computer.stat&~MAINT)) // closed laptops use maint, allow it
- return
- if(computer.program)
- computer.program.receive_signal(signal)
-
- proc/post_signal(var/datum/signal/signal)
- if(!computer || (computer.stat&~MAINT) || !computer.program) return
- if(!radio_connection) return
-
- radio_connection.post_signal(src,signal,filter,range)
-
- get_machines(var/typekey)
- if(!radio_connection || !radio_connection.frequency)
- return list()
- var/list/result = list()
- var/turf/T = get_turf(loc)
- var/z_level = T.z
- for(var/obj/O in radio_connection.devices)
- if(istype(O,typekey))
- T = get_turf(O)
- // TODO: Make the radio system cooperate with the space manager
- if(istype(O) && (subspace || (O.z == z_level))) // radio does not work across z-levels
- result |= O
- return result
-
- verify_machine(var/obj/previous)
- if(!previous) return 0
- if(subspace)
- return ( radio_connection && (previous in radio_connection.devices) )
- else
- var/turf/T = get_turf(loc)
- var/turf/O = get_turf(previous)
- if(!T || !O)
- return 0
- return ( radio_connection && (previous in radio_connection.devices) && (T.z == O.z))
-
-/*
- Subspace networking: Communicates off-station. Allows centcom communications.
-*/
-/obj/item/part/computer/networking/radio/subspace
- name = "subspace networking terminal"
- desc = "Communicates long distances and through spatial anomalies."
- subspace = 1
-
-/*
- APC (/area) networking
-*/
-
-/obj/item/part/computer/networking/area
- name = "short-wave networking terminal"
- desc = "Connects to nearby computers through the area power network"
-
- get_machines(var/typekey)
- var/area/A = get_area(loc)
- if(!istype(A) || A == /area)
- return list()
- if(typekey == null)
- typekey = /obj/machinery
- var/list/machines = list()
- for(var/obj/O in A.contents)
- if(istype(O,typekey))
- machines |= O
- return machines
- verify_machine(var/obj/previous)
- if(!previous) return 0
- var/area/A = get_area(src)
- if( A && A == get_area(previous) )
- return 1
- return 0
-
-/*
- Proximity networking: Connects to machines or computers adjacent to this device
-*/
-/obj/item/part/computer/networking/prox
- name = "proximity networking terminal"
- desc = "Connects a computer to adjacent machines"
-
- get_machines(var/typekey)
- var/turf/T = get_turf(loc)
- if(!istype(T))
- return list()
- if(typekey == null)
- typekey = /obj/machinery
- var/list/machines = list()
- for(var/d in cardinal)
- var/turf/T2 = get_step(T,d)
- for(var/obj/O in T2)
- if(istype(O,typekey))
- machines += O
- return machines
-
- verify_machine(var/obj/previous)
- if(!previous)
- return 0
- if(get_dist(get_turf(previous),get_turf(loc)) == 1)
- return 1
- return 0
-/*
- Cable networking: Not currently used
-*/
-
-/obj/item/part/computer/networking/cable
- name = "cable networking terminal"
- desc = "Connects to other machines on the same cable network."
-
- get_machines(var/typekey)
-// if(istype(computer,/obj/machinery/computer/laptop)) // laptops move, this could get breaky
-// return list()
- var/turf/T = get_turf(loc)
- var/datum/powernet/P = null
- for(var/obj/structure/cable/C in T)
- if(C.d1 == 0)
- P = C.powernet
- break
- if(!P)
- return list()
- if(!typekey)
- typekey = /obj/machinery
- else if(typekey == /datum/powernet)
- return list(P)
- var/list/candidates = list()
- for(var/atom/A in P.nodes)
- if(istype(A,typekey))
- candidates += A
- else if(istype(A,/obj/machinery/power/terminal))
- var/obj/machinery/power/terminal/PT = A
- if(istype(PT.master,typekey))
- candidates += PT.master
- return candidates
-
- verify_machine(var/obj/previous)
- if(!previous)
- return 0
- var/turf/T = get_turf(loc)
- var/datum/powernet/P = null
- for(var/obj/structure/cable/C in T)
- if(C.d1 == 0)
- P = C.powernet
- break
- if(istype(previous,/datum/powernet))
- if(previous == P)
- return 1
- return 0
- T = get_turf(previous.loc)
- for(var/obj/structure/cable/C in T)
- if(C.d1 == 0 && (C.powernet == P))
- return 1
- return 0
diff --git a/code/modules/computer3/program.dm b/code/modules/computer3/program.dm
deleted file mode 100644
index f1f68c0890d..00000000000
--- a/code/modules/computer3/program.dm
+++ /dev/null
@@ -1,404 +0,0 @@
-
-/*
-Programs are a file that can be executed
-*/
-
-/datum/file/program
- name = "Untitled"
- extension = "prog"
- image = 'icons/ntos/program.png'
- var/desc = "An unidentifiable program."
-
- var/image/overlay = null // Icon to be put on top of the computer frame.
-
- var/active_state = "generic" // the icon_state that the computer goes to when the program is active
-
- drm = 0 // prevents a program from being copied
- var/refresh = 0 // if true, computer does screen updates during process().
- var/error = 0 // set by background programs so an error pops up when used
-
- var/human_controls = 0 // if true, non-human animals cannot interact with this program (monkeys, xenos, etc)
- var/ai_allowed = 1 // if true, silicon mobs (AI/cyborg) are allowed to use this program.
-
- var/datum/browser/popup = null
-
- // ID access: Note that computer3 does not normally check your ID.
- // By default this is only really used for inserted cards.
- var/list/req_access = list() // requires all of these UNLESS below succeeds
- var/list/req_one_access = list() // requires one of these
-
-
-/datum/file/program/New()
- ..()
- if(!active_state)
- active_state = "generic"
- overlay = image('icons/obj/computer3.dmi',icon_state = active_state)
-
-
-/datum/file/program/proc/decode(text)
- //adds line breaks
- text = replacetext(text, "\n","
")
- return text
-
-
-
-/datum/file/program/execute(var/datum/file/source)
- if(computer && !computer.stat)
- computer.program = src
- computer.req_access = req_access
- computer.req_one_access = req_one_access
- update_icon()
- computer.update_icon()
- if(usr)
- usr << browse(null, "window=\ref[computer]")
- computer.attack_hand(usr)
-
- ..()
-
-/*
- Standard Topic() for links
-*/
-
-/datum/file/program/Topic(href, href_list)
- return
-
-/*
- The computer object will transfer all empty-hand calls to the program (this includes AIs, Cyborgs, and Monkies)
-*/
-/datum/file/program/proc/interact()
- return
-
-/*
- Standard receive_signal()
-*/
-
-/datum/file/program/proc/receive_signal(var/datum/signal/signal)
- return
-/*
- The computer object will transfer all attackby() calls to the program
- If the item is a valid interactable object, return 1. Else, return 0.
- This helps identify what to use to actually hit the computer with, and
- what can be used to interact with it.
-
- Screwdrivers will, by default, never call program/attackby(). That's used
- for deconstruction instead.
-*/
-
-
-/datum/file/program/proc/attackby(O as obj, user as mob, params)
- return
-
-/*
- Try not to overwrite this proc, I'd prefer we stayed
- with interact() as the main proc
-*/
-/datum/file/program/proc/attack_hand(mob/user as mob)
- usr = user
- interact()
-
-/*
- Called when the computer is rebooted or the program exits/restarts.
- Be sure not to save any work. Do NOT start the program again.
- If it is the os, the computer will run it again automatically.
-
- Also, we are deleting the browser window on the chance that this is happening
- when the computer is damaged or disassembled, causing us to lose our computer.
- The popup window's title is a reference to the computer, making it unique, so
- it could introduce bugs in that case.
-*/
-/datum/file/program/proc/Reset()
- error = 0
- update_icon()
- if(popup)
- popup.close()
- qdel(popup)
- return
-
-/*
- The computer object will transfer process() calls to the program.
-*/
-/datum/file/program/proc/process()
- if(refresh && computer && !computer.stat)
- computer.updateDialog()
- update_icon()
-
-/datum/file/program/proc/update_icon()
- return
-
-/datum/file/program/proc/check_access(obj/item/I)
- if( (!istype(req_access) || !req_access.len) && (!istype(req_one_access) || !req_one_access.len) ) //no requirements
- return 1
-
- if(!I)
- return 0
-
- var/list/iAccess = I.GetAccess()
- if(!iAccess || !iAccess.len)
- return 0
-
- var/list/temp = req_one_access & iAccess
- if(temp.len) // a required access in item access list
- return 1
- temp = req_access - iAccess
- if(temp.len) // a required access not in item access list
- return 0
- return 1
-
-
-/*
- Because this does sanity checks I have added the code to make a popup here.
- It also does sanity checks there that should prevent some edge case madness.
-*/
-/datum/file/program/proc/interactable(var/mob/user = usr)
- if(computer && computer.interactable(user))
- if(!popup)
- popup = new(user, "\ref[computer]", name, nref=src)
- popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state))
- popup.set_title_buttons(topic_link(src,"quit","
"))
- if(popup.user != user)
- popup.user = user
- popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state))
- popup.set_title(name)
- return 1
- return 0
-
-
-/datum/file/program/proc/fake_link(var/text)
- return "[text]"
-
-/*
- Meant for text (not icons) -
- lists all installed drives and their files
-
- I am NOT adding a computer sanity check here,
- because why the flying fuck would you get to this
- proc before having run it at least once?
- If you cause runtimes with this function
- may the shame of all ages come upon you.
-*/
-/datum/file/program/proc/list_all_files_by_drive(var/typekey,var/linkop = "runfile")
- var/dat = ""
- if(!typekey) typekey = /datum/file
- if(computer.hdd)
- dat += "[computer.hdd]
"
- for(var/datum/file/F in computer.hdd.files)
- if(istype(F,typekey))
- dat += topic_link(src,"[linkop]=\ref[F]",F.name) + "
"
- if(computer.hdd.files.len == 0)
- dat += "No files
"
- dat += "
"
-
- if(computer.floppy)
- if(!computer.floppy.inserted)
- dat += "[computer.floppy] - Eject
"
- else
- dat += "[computer.floppy] - [topic_link(src,"eject_disk","Eject")]
"
- for(var/datum/file/F in computer.floppy.inserted.files)
- dat += topic_link(src,"[linkop]=\ref[F]",F.name) + "
"
- if(computer.floppy.inserted.files.len == 0)
- dat += "No files
"
- dat += "
"
-
- if(computer.cardslot && istype(computer.cardslot.reader,/obj/item/weapon/card/data))
- dat += "[computer.cardslot.reader] - [topic_link(src,"eject_card=reader","Eject")]
"
- var/obj/item/weapon/card/data/D = computer.cardslot.reader
- for(var/datum/file/F in D.files)
- dat += topic_link(src,"[linkop]=\ref[F]",F.name) + "
"
- if(D.files.len == 0)
- dat += "No files
"
- return dat
-
-// You don't NEED to use this version of topic() for this, you can do it yourself if you prefer
-// If you do, do the interactable() check first, please, I don't want to repeat it here. It's not hard.
-/datum/file/program/Topic(var/href,var/list/href_list)
- if(!computer)
- return 0
-
- //
- // usage: eject_disk
- // only functions if there is a removable drive
- //
- if("eject_disk" in href_list)
- if(computer.floppy)
- computer.floppy.eject_disk()
- return 1
- //
- // usage: eject_card | eject_card=reader | eject_card=writer
- // only functions if there is a cardslot
- //
- if("eject_card" in href_list)
- if(computer.cardslot)
- if(computer.cardslot.dualslot && href_list["eject_card"] == "writer")
- computer.cardslot.remove(computer.cardslot.writer)
- else
- computer.cardslot.remove(computer.cardslot.reader)
- return 1
- //
- // usage: runfile=\ref[file]
- // executes the file
- //
- if("runfile" in href_list)
- var/datum/file/F = locate(href_list["runfile"])
- if(istype(F) && F.computer == computer)
- F.execute(src)
- return 1
-
- if("close" in href_list)
- usr.unset_machine()
- popup.close()
- return 1
- //
- // usage: quit
- // unloads the program, returning control to the OS
- //
- if("quit" in href_list)
- computer.program = null
- usr << browse(null,"window=\ref[computer]") // ntos will need to resize the window
- computer.update_icon()
- computer.updateDialog()
- return 1
- return 0
-
-
-/datum/file/program/RD
- name = "R&D Manager"
- image = 'icons/ntos/research.png'
- desc = "A software suit for generic research and development machinery interaction. Comes pre-packaged with extensive cryptographic databanks for secure connections with external devices."
- active_state = "rdcomp"
- volume = 11000
-
-/datum/file/program/RDserv
- name = "R&D Server"
- image = 'icons/ntos/server.png'
- active_state = "rdcomp"
- volume = 9000
-
-/datum/file/program/SuitSensors
- name = "Crew Monitoring"
- image = 'icons/ntos/monitoring.png'
- active_state = "crew"
- volume = 3400
-
-/datum/file/program/Genetics
- name = "Genetics Suite"
- image = 'icons/ntos/genetics.png'
- desc = "A sophisticated software suite containing read-only genetics hardware specifications and a highly compressed genome databank."
- active_state = "dna"
- volume = 8000
-
-/datum/file/program/Cloning
- name = "Cloning Platform"
- image = 'icons/ntos/cloning.png'
- desc = "A software platform for accessing external cloning apparatus."
- active_state = "dna"
- volume = 7000
-
-/datum/file/program/TCOMmonitor
- name = "TComm Monitor"
- image = 'icons/ntos/tcomms.png'
- active_state = "comm_monitor"
- volume = 5500
-
-/datum/file/program/TCOMlogs
- name = "TComm Log View"
- image = 'icons/ntos/tcomms.png'
- active_state = "comm_logs"
- volume = 5230
-
-/datum/file/program/TCOMtraffic
- name = "TComm Traffic"
- image = 'icons/ntos/tcomms.png'
- active_state = "generic"
- volume = 8080
-
-/datum/file/program/securitycam
- name = "Sec-Cam Viewport"
- image = 'icons/ntos/camera.png'
- drm = 1
- active_state = "cameras"
- volume = 2190
-
-/datum/file/program/securityrecords
- name = "Security Records"
- image = 'icons/ntos/records.png'
- drm = 1
- active_state = "security"
- volume = 2520
-
-/datum/file/program/medicalrecords
- name = "Medical Records"
- image = 'icons/ntos/medical.png'
- drm = 1
- active_state = "medcomp"
- volume = 5000
-
-/datum/file/program/SMSmonitor
- name = "Messaging Monitor"
- image = 'icons/ntos/pda.png'
- active_state = "comm_monitor"
- volume = 3070
-
-/datum/file/program/OperationMonitor
- name = "OR Monitor"
- image = 'icons/ntos/operating.png'
- active_state = "operating"
- volume = 4750
-
-/datum/file/program/PodLaunch
- name = "Pod Launch"
- active_state = "computer_generic"
- volume = 520
-
-/datum/file/program/powermon
- name = "Power Grid"
- image = 'icons/ntos/power.png'
- active_state = "power"
- volume = 7200
-
-/datum/file/program/prisoner
- name = "Prisoner Control"
- image = 'icons/ntos/prison.png'
- drm = 1
- active_state = "power"
- volume = 5000
-/*
-/datum/file/program/borg_control
- name = "Cyborg Maint"
- image = 'icons/ntos/borgcontrol.png'
- active_state = "robot"
- volume = 9050 */
-
-/datum/file/program/AIupload
- name = "AI Upload"
- image = 'icons/ntos/aiupload.png'
- active_state = "command"
- volume = 5000
-
-/datum/file/program/Cyborgupload
- name = "Cyborg Upload"
- image = 'icons/ntos/borgupload.png'
- active_state = "command"
- volume = 5000
-
-/datum/file/program/Exosuit
- name = "Exosuit Monitor"
- image = 'icons/ntos/exocontrol.png'
- active_state = "mecha"
- volume = 7000
-
-/datum/file/program/EmergencyShuttle
- name = "Shuttle Console"
- active_state = "shuttle"
- volume = 10000
-
-/datum/file/program/Stationalert
- name = "Alert Monitor"
- image = 'icons/ntos/alerts.png'
- active_state = "computer_generic"
- volume = 10150
-
-
-
-
-
-
diff --git a/code/modules/computer3/program_disks.dm b/code/modules/computer3/program_disks.dm
deleted file mode 100644
index 64b592b06be..00000000000
--- a/code/modules/computer3/program_disks.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-/obj/item/weapon/disk/file/arcade
- name = "Arcade game grab pack"
- desc = "A program install disk."
- spawn_files = list(/datum/file/program/arcade,/datum/file/program/arcade,/datum/file/program/arcade,/datum/file/program/arcade)
-
-/*/obj/item/weapon/disk/file/aifixer
- name = "AI System Integrity Restorer"
- desc = "A program install disk."
- spawn_files = list(/datum/file/program/aifixer)*/
-
-/obj/item/weapon/disk/file/atmos_alert
- name = "Atmospheric Alert Notifier"
- desc = "A program install disk."
- spawn_files = list(/datum/file/program/atmos_alert)
-
-/obj/item/weapon/disk/file/cameras
- name = "Camera Viewer"
- desc = "A program install disk."
- spawn_files = list(/datum/file/program/security)
-
-/obj/item/weapon/disk/file/card
- name = "ID Card Modifier"
- desc = "A program install disk."
- spawn_files = list(/datum/file/program/card_comp)
-/*
-/obj/item/weapon/disk/file/genetics
- name = "Genetics & Cloning"
- desc = "A program install disk."
- spawn_files = list(/datum/file/program/cloning,/datum/file/program/dnascanner)
-*/
diff --git a/code/modules/computer3/server.dm b/code/modules/computer3/server.dm
deleted file mode 100644
index 9e32918feae..00000000000
--- a/code/modules/computer3/server.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Todo:
- I can probably get away with a global list on servers that contains database sort of stuff
- (replacing the datacore probably)
- with the justification that they loadbalance and duplicate data across each other. As long as
- one server-type computer exists, the station will still have access to datacore-type info.
-
- I can doubtless use this for station alerts as well, which is good, because I was sort of
- wondering how the hell I was going to port that.
-
- Also todo: Server computers should maybe generate heat the way the R&D server does?
- At least the rack computer probably should.
-*/
-
-/obj/machinery/computer3/server
- name = "server"
- icon = 'icons/obj/computer3.dmi'
- icon_state = "serverframe"
- show_keyboard = 0
-
-/obj/machinery/computer3/server/rack
- name = "server rack"
- icon_state = "rackframe"
-
- spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/networking/radio/subspace)
-
- update_icon()
- //overlays.Cut()
- return
-
- attack_hand() // Racks have no screen, only AI can use them
- return
diff --git a/code/modules/computer3/storage.dm b/code/modules/computer3/storage.dm
deleted file mode 100644
index acb569d3072..00000000000
--- a/code/modules/computer3/storage.dm
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- Computer devices that can store programs, files, etc.
-*/
-
-/obj/item/part/computer/storage
- name = "Storage Device"
- desc = "A device used for storing and retrieving digital information."
-
- // storage capacity, kb
- var/volume = 0
- var/max_volume = 64 // should be enough for anyone
-
- var/driveletter = null // drive letter according to the computer
-
- var/list/files = list() // a list of files in the memory (ALL files)
- var/removeable = 0 // determinse if the storage device is a removable hard drive (ie floppy)
-
-
- var/writeprotect = 0 // determines if the drive forbids writing.
- // note that write-protect is hardware and does not respect emagging.
-
- var/list/spawnfiles = list()// For mappers, special drives, and data disks
-
- New()
- ..()
- if(islist(spawnfiles))
- if(removeable && spawnfiles.len)
- var/obj/item/part/computer/storage/removable/R = src
- R.inserted = new(src)
- if(writeprotect)
- R.inserted.writeprotect = 1
- for(var/typekey in spawnfiles)
- addfile(new typekey(),1)
-
- // Add a file to the hard drive, returns 0 if failed
- // forced is used when spawning files on a write-protect drive
- proc/addfile(var/datum/file/F,var/forced = 0)
- if(!F || crit_fail || (F in files))
- return 1
- if(writeprotect && !forced)
- return 0
- if(volume + F.volume > max_volume)
- if(!forced)
- return 0
- max_volume = volume + F.volume
-
- files.Add(F)
- volume += F.volume
- F.computer = computer
- F.device = src
- return 1
- proc/removefile(var/datum/file/F,var/forced = 0)
- if(!F || !(F in files))
- return 1
- if(writeprotect && !forced)
- return 0
-
- files -= F
- volume -= F.volume
- if(F.device == src)
- F.device = null
- F.computer = null
- return 1
-
- init(var/obj/machinery/computer/target)
- computer = target
- for(var/datum/file/F in files)
- F.computer = computer
-
-/*
- Standard hard drives for computers. Used in computer construction
-*/
-
-/obj/item/part/computer/storage/hdd
- name = "Hard Drive"
- max_volume = 25000
- icon_state = "hdd1"
-
-
-/obj/item/part/computer/storage/hdd/big
- name = "Big Hard Drive"
- max_volume = 50000
- icon_state = "hdd2"
-
-/obj/item/part/computer/storage/hdd/gigantic
- name = "Gigantic Hard Drive"
- max_volume = 75000
- icon_state = "hdd3"
-
-/*
- Removeable hard drives for portable storage
-*/
-
-/obj/item/part/computer/storage/removable
- name = "Disk Drive"
- max_volume = 3000
- removeable = 1
-
- attackby_types = list(/obj/item/weapon/disk/file, /obj/item/weapon/pen)
- var/obj/item/weapon/disk/file/inserted = null
-
- proc/eject_disk(var/forced = 0)
- if(!forced)
- return
- files = list()
- inserted.loc = computer.loc
- if(usr)
- if(!usr.get_active_hand())
- usr.put_in_active_hand(inserted)
- else if(forced && !usr.get_inactive_hand())
- usr.put_in_inactive_hand(inserted)
- for(var/datum/file/F in inserted.files)
- F.computer = null
- inserted = null
-
-
- attackby(obj/O as obj, mob/user as mob, params)
- if(inserted && istype(O,/obj/item/weapon/pen))
- to_chat(usr, "You use [O] to carefully pry [inserted] out of [src].")
- eject_disk(forced = 1)
- return
-
- if(istype(O,/obj/item/weapon/disk/file))
- if(inserted)
- to_chat(usr, "There's already a disk in [src]!")
- return
-
- to_chat(usr, "You insert [O] into [src].")
- usr.drop_item()
- O.loc = src
- inserted = O
- writeprotect = inserted.writeprotect
-
- files = inserted.files
- for(var/datum/file/F in inserted.files)
- F.computer = computer
-
- return
-
- ..()
-
- addfile(var/datum/file/F)
- if(!F || !inserted)
- return 0
-
- if(F in inserted.files)
- return 1
-
- if(inserted.volume + F.volume > inserted.max_volume)
- return 0
-
- inserted.files.Add(F)
- F.computer = computer
- F.device = inserted
- return 1
-
-/*
- Removable hard drive presents...
- removeable disk!
-*/
-
-/obj/item/weapon/disk/file
- //parent_type = /obj/item/part/computer/storage // todon't: do this
- name = "Data Disk"
- desc = "A device that can be inserted and removed into computers easily as a form of portable data storage. This one stores 1 Megabyte"
- icon_state = "datadisk_arcade"
- var/list/files
- var/list/spawn_files = list()
- var/writeprotect = 0
- var/volume = 0
- var/max_volume = 1028
-
-
- New()
- ..()
- icon_state = "datadisk[rand(0,6)]"
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
- files = list()
- if(istype(spawn_files))
- for(var/typekey in spawn_files)
- var/datum/file/F = new typekey()
- F.device = src
- files += F
- volume += F.volume
diff --git a/code/modules/computer3/test_machines.dm b/code/modules/computer3/test_machines.dm
deleted file mode 100644
index 53a96d6c057..00000000000
--- a/code/modules/computer3/test_machines.dm
+++ /dev/null
@@ -1,86 +0,0 @@
-
-/obj/machinery/computer3/testing
- spawn_files = list(/datum/file/program/aifixer,/datum/file/program/arcade,/datum/file/program/atmos_alert,
- /datum/file/program/security,/datum/file/program/card_comp,
- /datum/file/program/borg_control,/datum/file/program/holodeck, /datum/file/program/communications,
- /datum/file/program/crew,/datum/file/program/op_monitor, /datum/file/program/powermon,
-
- /datum/file/camnet_key,/datum/file/camnet_key/mining,/datum/file/camnet_key/entertainment,/datum/file/camnet_key/research,
- /datum/file/camnet_key/bombrange,/datum/file/camnet_key/xeno,/datum/file/camnet_key/singulo,/datum/file/camnet_key/prison)
- spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/storage/removable,/obj/item/part/computer/ai_holder,
- /obj/item/part/computer/networking/radio/subspace,/obj/item/part/computer/networking/cameras,
- /obj/item/part/computer/cardslot/dual,/obj/item/part/computer/networking/area)
- New(var/L,var/built=0)
- if(!built && !battery)
- battery = new /obj/item/weapon/stock_parts/cell(src)
- ..(L,built)
-
-/obj/machinery/computer3/laptop/testing
- spawn_files = list(/datum/file/program/aifixer,/datum/file/program/arcade,/datum/file/program/atmos_alert,
- /datum/file/program/security,/datum/file/program/card_comp,
- /datum/file/program/borg_control,/datum/file/program/holodeck, /datum/file/program/communications,
- /datum/file/program/crew,/datum/file/program/op_monitor, /datum/file/program/powermon,
-
- /datum/file/camnet_key,/datum/file/camnet_key/mining,/datum/file/camnet_key/entertainment,/datum/file/camnet_key/research,
- /datum/file/camnet_key/bombrange,/datum/file/camnet_key/xeno,/datum/file/camnet_key/singulo,/datum/file/camnet_key/prison)
- spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/storage/removable,/obj/item/part/computer/ai_holder,
- /obj/item/part/computer/networking/radio/subspace,/obj/item/part/computer/networking/cameras,
- /obj/item/part/computer/cardslot/dual,/obj/item/part/computer/networking/area)
- New(var/L,var/built=0)
- if(!built && !battery)
- battery = new /obj/item/weapon/stock_parts/cell/super(src)
- ..(L,built)
-
-/obj/machinery/computer3/wall_comp/testing
- spawn_files = list(/datum/file/program/aifixer,/datum/file/program/arcade,/datum/file/program/atmos_alert,
- /datum/file/program/security,/datum/file/program/card_comp,
- /datum/file/program/borg_control,/datum/file/program/holodeck, /datum/file/program/communications,
- /datum/file/program/crew,/datum/file/program/op_monitor, /datum/file/program/powermon,
-
- /datum/file/camnet_key,/datum/file/camnet_key/mining,/datum/file/camnet_key/entertainment,/datum/file/camnet_key/research,
- /datum/file/camnet_key/bombrange,/datum/file/camnet_key/xeno,/datum/file/camnet_key/singulo,/datum/file/camnet_key/prison)
- spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/storage/removable,/obj/item/part/computer/ai_holder,
- /obj/item/part/computer/networking/radio/subspace,/obj/item/part/computer/networking/cameras,
- /obj/item/part/computer/cardslot/dual,/obj/item/part/computer/networking/area)
- New(var/L,var/built=0)
- if(!built && !battery)
- battery = new /obj/item/weapon/stock_parts/cell(src)
- ..(L,built)
-
-/obj/machinery/computer3/server/testing
- spawn_files = list(/datum/file/program/aifixer,/datum/file/program/arcade,/datum/file/program/atmos_alert,
- /datum/file/program/security,/datum/file/program/card_comp,
- /datum/file/program/borg_control,/datum/file/program/holodeck, /datum/file/program/communications,
- /datum/file/program/crew,/datum/file/program/op_monitor, /datum/file/program/powermon,
-
- /datum/file/camnet_key,/datum/file/camnet_key/mining,/datum/file/camnet_key/entertainment,/datum/file/camnet_key/research,
- /datum/file/camnet_key/bombrange,/datum/file/camnet_key/xeno,/datum/file/camnet_key/singulo,/datum/file/camnet_key/prison)
- spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/storage/removable,/obj/item/part/computer/ai_holder,
- /obj/item/part/computer/networking/radio/subspace,/obj/item/part/computer/networking/cameras,
- /obj/item/part/computer/cardslot/dual,/obj/item/part/computer/networking/area)
- New(var/L,var/built=0)
- if(!built && !battery)
- battery = new /obj/item/weapon/stock_parts/cell(src)
- ..(L,built)
-
-/obj/machinery/computer3/server/rack/testing
- spawn_files = list(/datum/file/program/aifixer,/datum/file/program/arcade,/datum/file/program/atmos_alert,
- /datum/file/program/security,/datum/file/program/card_comp,
- /datum/file/program/borg_control,/datum/file/program/holodeck, /datum/file/program/communications,
- /datum/file/program/crew,/datum/file/program/op_monitor, /datum/file/program/powermon,
-
- /datum/file/camnet_key,/datum/file/camnet_key/mining,/datum/file/camnet_key/entertainment,/datum/file/camnet_key/research,
- /datum/file/camnet_key/bombrange,/datum/file/camnet_key/xeno,/datum/file/camnet_key/singulo,/datum/file/camnet_key/prison)
- spawn_parts = list(/obj/item/part/computer/storage/hdd/big,/obj/item/part/computer/storage/removable,/obj/item/part/computer/ai_holder,
- /obj/item/part/computer/networking/radio/subspace,/obj/item/part/computer/networking/cameras,
- /obj/item/part/computer/cardslot/dual,/obj/item/part/computer/networking/area)
- New(var/L,var/built=0)
- if(!built && !battery)
- battery = new /obj/item/weapon/stock_parts/cell(src)
- ..(L,built)
-
-/obj/item/weapon/storage/box/testing_disks
- New()
- ..()
- for(var/typekey in subtypesof(/obj/item/weapon/disk/file))
- new typekey(src)
\ No newline at end of file
diff --git a/code/modules/computer3/upload/lawfile.dm b/code/modules/computer3/upload/lawfile.dm
deleted file mode 100644
index 7fcbac00663..00000000000
--- a/code/modules/computer3/upload/lawfile.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Computer3 law changes:
-
- * Laws are a file type
- * Connecting to the AI requires a network connection
- * Connecting to a borg requires a radio or network.
-
-*/
-
-/datum/file/ai_law
- var/list/hacklaws = null
- var/zerolaw = null
- var/list/corelaws = null
- var/list/auxlaws = null
-
- var/configurable = 0
-
- // override this when you need to be able to alter the parameters of the lawset
- proc/configure()
- return
-
- execute(var/datum/file/program/source)
- if(istype(usr,/mob/living/silicon))
- return
- if(istype(source,/datum/file/program/ntos))
- if(configurable)
- configure()
- return
- if(istype(source,/datum/file/program/upload/ai))
\ No newline at end of file
diff --git a/code/modules/computer3/upload/programs.dm b/code/modules/computer3/upload/programs.dm
deleted file mode 100644
index 34197f3bf69..00000000000
--- a/code/modules/computer3/upload/programs.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- Note that as with existing ai upload, this is not an interactive program.
- That means that the work is done in execute() rather than interact()
-*/
-
-/datum/file/program/upload/ai
- execute(var/datum/file/program/source)
- if(!interactable() || istype(usr,/mob/living/silicon))
- return 0
- if(!computer.net)
- to_chat(usr, "An indecipherable set of code flicks across the screen. Nothing else happens.")
- return
- var/list/results = computer.net.get_machines
\ No newline at end of file
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 51a34d245ef..0e59788aa5b 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -425,11 +425,58 @@
#undef USED_MOD_HELM
#undef USED_MOD_SUIT
+/obj/item/device/fluff/merchant_sallet_modkit //Travelling Merchant: Trav Noble. This is what they spawn in with
+ name = "sallet modkit"
+ desc = "A modkit that can make most helmets look like a steel sallet."
+ icon_state = "modkit"
+ w_class = 2
+ force = 0
+ throwforce = 0
+
+/obj/item/device/fluff/merchant_sallet_modkit/afterattack(atom/target, mob/user, proximity)
+ if(!proximity || !ishuman(user) || user.incapacitated())
+ return
+
+ var/mob/living/carbon/human/H = user
+ if(istype(target, /obj/item/clothing/head/helmet) && !istype(target, /obj/item/clothing/head/helmet/space))
+ var/obj/item/clothing/head/helmet/helm = target
+ var/obj/item/clothing/head/helmet/fluff/merchant_sallet/sallet = new(get_turf(target))
+ sallet.flags = helm.flags
+ sallet.flags_cover = helm.flags_cover
+ sallet.armor = helm.armor
+ sallet.flags_inv = helm.flags_inv
+ sallet.cold_protection = helm.cold_protection
+ sallet.min_cold_protection_temperature = helm.min_cold_protection_temperature
+ sallet.heat_protection = helm.heat_protection
+ sallet.max_heat_protection_temperature = helm.max_heat_protection_temperature
+ sallet.strip_delay = helm.strip_delay
+ sallet.put_on_delay = helm.put_on_delay
+ sallet.burn_state = helm.burn_state
+ sallet.flags_cover = helm.flags_cover
+ if(helm.up)
+ sallet.flags &= ~helm.visor_flags
+ sallet.flags_inv &= ~helm.visor_flags_inv
+ if(!BLOCKHAIR in sallet.flags)
+ sallet.flags |= BLOCKHAIR
+ for(var/flag in list(HIDEMASK, HIDEFACE, HIDEEYES, HIDEEARS)) //Check for and apply missing flags.
+ if(!(sallet.flags_inv & flag))
+ sallet.flags_inv |= flag
+
+ sallet.add_fingerprint(H)
+ target.transfer_fingerprints_to(sallet)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ to_chat(user, "You modify [target] with [src].")
+ H.update_inv_head()
+ qdel(target)
+ qdel(src)
+ else
+ to_chat(user, "You can't modify [target]!")
+
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////
-//////////// Gloves ////////////
+//////////// Gloves //////////////
//////////// Eye Wear ////////////
/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro //T0EPIC4U: Ty Omaha
@@ -503,6 +550,57 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "kakicharakiti"
+/obj/item/clothing/head/helmet/fluff/merchant_sallet //Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with
+ name = "Steel Sallet"
+ desc = "A heavy steel sallet with the word Noble scratched into the side. Comes with a Bevor attached."
+ icon = 'icons/obj/custom_items.dmi'
+ icon_state = "merchant_sallet_visor_bevor"
+ item_state = "merchant_sallet_visor_bevor"
+ actions_types = list(/datum/action/item_action/toggle_helmet_mode)
+ toggle_cooldown = 20
+ toggle_sound = 'sound/items/ZippoClose.ogg'
+ flags = BLOCKHAIR
+ flags_inv = HIDEEYES|HIDEMASK|HIDEFACE|HIDEEARS
+ var/state = "Visor & Bevor"
+
+/obj/item/clothing/head/helmet/fluff/merchant_sallet/attack_self(mob/user)
+ if(!user.incapacitated() && (world.time > cooldown + toggle_cooldown) && Adjacent(user))
+ var/list/options = list()
+ options["Visor & Bevor"] = list(
+ "icon_state" = "merchant_sallet_visor_bevor",
+ "visor_flags" = HIDEEYES,
+ "mask_flags" = HIDEMASK|HIDEFACE
+ )
+ options["Visor Only"] = list(
+ "icon_state" = "merchant_sallet_visor",
+ "visor_flags" = HIDEEYES,
+ "mask_flags" = HIDEFACE
+ )
+ options["Bevor Only"] = list(
+ "icon_state" = "merchant_sallet_bevor",
+ "visor_flags" = null,
+ "mask_flags" = HIDEMASK|HIDEFACE
+ )
+ options["Neither Visor nor Bevor"] = list(
+ "icon_state" = "merchant_sallet",
+ "visor_flags" = null,
+ "mask_flags" = null
+ )
+
+ var/choice = input(user, "How would you like to adjust the sallet?", "Adjust Sallet") as null|anything in options
+
+ if(choice && choice != state && !user.incapacitated() && Adjacent(user))
+ var/list/new_state = options[choice]
+ var/list/old_state = options[state]
+ icon_state = new_state["icon_state"]
+ flags_inv &= ~(old_state["visor_flags"]|old_state["mask_flags"])
+ state = choice
+ flags_inv |= (new_state["visor_flags"]|new_state["mask_flags"])
+ to_chat(user, "You adjust the sallet.")
+ playsound(src.loc, "[toggle_sound]", 100, 0, 4)
+ user.update_inv_head()
+ return 1
+
//////////// Suits ////////////
/obj/item/clothing/suit/fluff
icon = 'icons/obj/custom_items.dmi'
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index a9b47376760..f9c97c87a0b 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -165,13 +165,11 @@ Gunshots/explosions/opening doors/less rare audio (done)
/obj/effect/hallucination/fake_flood/Destroy()
processing_objects -= src
- qdel(flood_turfs)
- flood_turfs = list()
+ flood_turfs.Cut()
if(target.client)
target.client.images.Remove(flood_images)
target = null
- qdel(flood_images)
- flood_images = list()
+ QDEL_LIST(flood_images)
return ..()
/obj/effect/hallucination/simple/xeno
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index dfd89a809da..7087410e6c4 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -372,8 +372,7 @@
overlays += T
/obj/item/weapon/reagent_containers/food/snacks/customizable/Destroy()
- for(var/obj/item/O in ingredients)
- qdel(O)
+ QDEL_LIST(ingredients)
return ..()
/obj/item/weapon/reagent_containers/food/snacks/customizable/examine(mob/user)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 908411f5731..ae7cf92c92d 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -28,7 +28,8 @@
if(contents.len)
for(var/atom/movable/A in contents)
A.loc = get_turf(src)
- if(occupant) occupant = null
+ if(occupant)
+ occupant = null
return ..()
/obj/machinery/gibber/RefreshParts() //If you want to make the machine upgradable, this is where you would change any vars basd on its stock parts.
diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm
index f0ca2d64474..51493432ace 100644
--- a/code/modules/garbage_collection/garbage_collector.dm
+++ b/code/modules/garbage_collection/garbage_collector.dm
@@ -13,8 +13,6 @@ var/list/sleptDestroy = list() //Same as above but these are paths that slept du
var/list/noqdelhint = list() // list of all types that do not return a QDEL_HINT
-var/global/datum/controller/process/garbage_collector/garbageCollector
-
// The time a datum was destroyed by the GC, or null if it hasn't been
/datum/var/gcDestroyed
// Whether a datum was hard-deleted by the GC; 0 if not, 1 if it was queued, -1 if directly deleted
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 2935ed25d04..a9151609f74 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -227,8 +227,7 @@
/obj/item/device/mobcapsule/Destroy()
if(captured)
captured.ghostize()
- qdel(captured)
- captured = null
+ QDEL_NULL(captured)
return ..()
/obj/item/device/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index b7dc83c149d..0750fd9841e 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -94,8 +94,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
following = null
if(ghostimage)
ghost_darkness_images -= ghostimage
- qdel(ghostimage)
- ghostimage = null
+ QDEL_NULL(ghostimage)
updateallghostimages()
return ..()
@@ -642,13 +641,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/proc/can_admin_interact()
return FALSE
-
+
/mob/proc/can_advanced_admin_interact()
return FALSE
/mob/dead/observer/can_admin_interact()
return check_rights(R_ADMIN, 0, src)
-
+
/mob/dead/observer/can_advanced_admin_interact()
if(!can_admin_interact())
return FALSE
@@ -657,7 +656,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return TRUE
return FALSE
-
+
/mob/dead/observer/incapacitated()
return TRUE
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index 898d23de066..0d6545d0a0f 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -103,8 +103,7 @@
t_suit = "armor"
standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_suit]blood")
- if(istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
- unEquip(handcuffed)
+ if(wear_suit.breakouttime)
drop_r_hand()
drop_l_hand()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 64811af21ac..5911c04f563 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -17,10 +17,8 @@
med_hud_set_status()
/mob/living/carbon/Destroy()
- for(var/atom/movable/guts in internal_organs)
- qdel(guts)
- for(var/atom/movable/food in stomach_contents)
- qdel(food)
+ QDEL_LIST(internal_organs)
+ QDEL_LIST(stomach_contents)
remove_from_all_data_huds()
return ..()
@@ -808,6 +806,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
legcuffed = null
update_inv_legcuffed()
return
+ else
+ unEquip(I)
+ I.dropped()
+ return
return 1
else
to_chat(src, "You fail to remove [I]!")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 599bece9523..693973ab42d 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -440,10 +440,10 @@
for(var/implant in get_visible_implants(0))
- msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n"
+ msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n"
if(digitalcamo)
msg += "[t_He] [t_is] repulsively uncanny!\n"
- if(!wear_mask && is_thrall(src) && in_range(user,src))
+ if(!(skipface || ( wear_mask && ( wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) ) ) && is_thrall(src) && in_range(user,src))
msg += "Their features seem unnaturally tight and drawn.\n"
if(decaylevel == 1)
msg += "[t_He] [t_is] starting to smell.\n"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index cc2458c7cf4..1c012655cdc 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1406,6 +1406,14 @@
if(..())
unEquip(I)
+/mob/living/carbon/human/resist_restraints()
+ if(wear_suit && wear_suit.breakouttime)
+ changeNext_move(CLICK_CD_BREAKOUT)
+ last_special = world.time + CLICK_CD_BREAKOUT
+ cuff_resist(wear_suit)
+ else
+ ..()
+
/mob/living/carbon/human/get_visible_implants(var/class = 0)
var/list/visible_implants = list()
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 20d6a717cde..1cb97bb3e19 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -964,8 +964,7 @@ var/global/list/damage_icon_parts = list()
standing = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]")
- if( istype(wear_suit, /obj/item/clothing/suit/straight_jacket) )
- unEquip(handcuffed)
+ if(wear_suit.breakouttime)
drop_l_hand()
drop_r_hand()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 9365da25f8d..31b4c826e9d 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -32,9 +32,7 @@
emag.name = "Placeholder Emag Item"
/obj/item/weapon/robot_module/Destroy()
- for(var/module in modules)
- qdel(module)
- modules.Cut()
+ QDEL_LIST(modules)
QDEL_NULL(emag)
return ..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 97791a9cacc..a1b6c652913 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -2,13 +2,11 @@
mob_list -= src
dead_mob_list -= src
living_mob_list -= src
- qdel(hud_used)
- hud_used = null
+ QDEL_NULL(hud_used)
if(mind && mind.current == src)
spellremove(src)
mobspellremove(src)
- for(var/infection in viruses)
- qdel(infection)
+ QDEL_LIST(viruses)
ghostize()
for(var/mob/dead/observer/M in following_mobs)
M.following = null
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 77593c8c74a..5572f9cc8af 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -566,6 +566,12 @@
name = "Unathi Side Frills"
icon_state = "unathi_sidefrills"
secondary_theme = "webbing"
+
+/datum/sprite_accessory/hair/unathi/una_cobra_hood
+ icon = 'icons/mob/human_face.dmi'
+ name = "Unathi Cobra Hood"
+ icon_state = "unathi_cobrahood"
+ secondary_theme = "webbing"
/datum/sprite_accessory/hair/unathi/una_frills_dorsal
icon = 'icons/mob/human_face.dmi'
diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index 707e16e22ac..caf0406336b 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -119,8 +119,7 @@
return null
/obj/item/weapon/computer_hardware/hard_drive/Destroy()
- for(var/file in stored_files)
- qdel(file)
+ QDEL_LIST(stored_files)
stored_files = null
return ..()
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index ece95ab2584..89ba611f33c 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -18,10 +18,7 @@
..()
/obj/item/weapon/paper_bin/Destroy()
- if(papers)
- for(var/i in papers)
- qdel(i)
- papers.Cut()
+ QDEL_LIST(papers)
return ..()
/obj/item/weapon/paper_bin/burn()
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index 966a418e5ad..3ff11689078 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -464,9 +464,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
pai.forceMove(T)
current_app = null
scanmode = null
- for(var/A in programs)
- qdel(A)
- programs.Cut()
+ QDEL_LIST(programs)
QDEL_NULL(cartridge)
return ..()
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index 0fa2c10c88e..459ae09835a 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -25,12 +25,8 @@
/obj/item/weapon/cartridge/Destroy()
QDEL_NULL(radio)
- for(var/A in programs)
- qdel(A)
- programs.Cut()
- for(var/A in messenger_plugins)
- qdel(A)
- messenger_plugins.Cut()
+ QDEL_LIST(programs)
+ QDEL_LIST(messenger_plugins)
return ..()
/obj/item/weapon/cartridge/proc/update_programs(obj/item/device/pda/pda)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 8754051b8e3..114ffc29d6f 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -39,11 +39,10 @@
processing_objects.Add(src)
poi_list |= src
singularities += src
- for(var/obj/machinery/power/singularity_beacon/singubeacon in world)
+ for(var/obj/machinery/power/singularity_beacon/singubeacon in machines)
if(singubeacon.active)
target = singubeacon
break
- return
/obj/singularity/Destroy()
processing_objects.Remove(src)
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 715318f0992..77ff3801da2 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -21,9 +21,7 @@
RefreshParts()
/obj/machinery/power/tesla_coil/Destroy()
- if(wires)
- qdel(wires)
- wires = null
+ QDEL_NULL(wires)
return ..()
/obj/machinery/power/tesla_coil/RefreshParts()
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 6182f105a5c..b231e32b183 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -49,9 +49,7 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
EB.orbiting_balls -= src
orbiting = null
- for(var/ball in orbiting_balls)
- var/obj/singularity/energy_ball/EB = ball
- qdel(EB)
+ QDEL_LIST(orbiting_balls)
return ..()
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index cbbe43cd32c..924dcac3b4c 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -103,8 +103,7 @@
update_icon()
/obj/item/ammo_box/Destroy()
- for(var/atom/A in stored_ammo)
- qdel(A)
+ QDEL_LIST(stored_ammo)
stored_ammo = null
return ..()
@@ -193,4 +192,4 @@
var/turf_mag = get_turf(src)
for(var/obj/item/ammo in stored_ammo)
ammo.forceMove(turf_mag)
- stored_ammo -= ammo
\ No newline at end of file
+ stored_ammo -= ammo
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
index 345d183318f..f9a8d00bdb1 100644
--- a/code/modules/projectiles/guns/rocket.dm
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -20,10 +20,8 @@
to_chat(user, "[rockets.len] / [max_rockets] rockets.")
/obj/item/weapon/gun/rocketlauncher/Destroy()
- for(var/datum/D in rockets)
- qdel(D)
+ QDEL_LIST(rockets)
rockets = null
-
return ..()
/obj/item/weapon/gun/rocketlauncher/update_icon()
diff --git a/code/modules/projectiles/guns/throw.dm b/code/modules/projectiles/guns/throw.dm
index 7b1fa350fc7..f19069bc32f 100644
--- a/code/modules/projectiles/guns/throw.dm
+++ b/code/modules/projectiles/guns/throw.dm
@@ -37,10 +37,8 @@
/obj/item/weapon/gun/throw/Destroy()
QDEL_NULL(to_launch)
- for(var/atom/A in loaded_projectiles)
- qdel(A)
+ QDEL_LIST(loaded_projectiles)
loaded_projectiles = null
-
return ..()
/obj/item/weapon/gun/throw/update_icon()
diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm
index cb0ee34ad75..a223f415165 100644
--- a/code/modules/projectiles/projectile/reusable.dm
+++ b/code/modules/projectiles/projectile/reusable.dm
@@ -57,7 +57,7 @@
newdart.update_icon()
/obj/item/projectile/bullet/reusable/foam_dart/Destroy()
- pen = null
+ QDEL_NULL(pen)
return ..()
/obj/item/projectile/bullet/reusable/foam_dart/riot
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 2b1a8706123..c65c628353b 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -747,9 +747,7 @@ atom/proc/create_reagents(max_vol)
/datum/reagents/Destroy()
. = ..()
processing_objects -= src
- for(var/datum/reagent/R in reagent_list)
- qdel(R)
- reagent_list.Cut()
+ QDEL_LIST(reagent_list)
reagent_list = null
if(my_atom && my_atom.reagents == src)
my_atom.reagents = null
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 727574fed16..c441ab97805 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -78,4 +78,4 @@
reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this))
to_chat(user, "You fill [src] from [source].")
return
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 336e0080ee7..b9d429b0597 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -1,116 +1,111 @@
////////////////////////////////////////////////////////////////////////////////
-/// Droppers.
+/// Droppers. ///
////////////////////////////////////////////////////////////////////////////////
+
/obj/item/weapon/reagent_containers/dropper
name = "dropper"
desc = "A dropper. Transfers 5 units."
- icon = 'icons/obj/chemical.dmi'
icon_state = "dropper"
+ item_state = "dropper"
amount_per_transfer_from_this = 5
- possible_transfer_amounts = list(1,2,3,4,5)
+ possible_transfer_amounts = list(1, 2, 3, 4, 5)
volume = 5
/obj/item/weapon/reagent_containers/dropper/on_reagent_change()
- if(reagents.total_volume <= 0)
+ if(!reagents.total_volume)
icon_state = "[initial(icon_state)]"
else
icon_state = "[initial(icon_state)]1"
-/obj/item/weapon/reagent_containers/dropper/afterattack(obj/target, mob/user , flag)
- if(!target.reagents)
+/obj/item/weapon/reagent_containers/dropper/attack(mob/living/M, mob/living/user, def_zone)
+ return
+
+/obj/item/weapon/reagent_containers/dropper/afterattack(atom/target, mob/user, proximity)
+ if(!proximity)
return
+ var/to_transfer = 0
+ if(iscarbon(target))
+ var/mob/living/carbon/C = target
+ if(!reagents.total_volume)
+ return
+ if(user != C)
+ visible_message("[user] begins to drip something into [C]'s eyes!")
+ if(!do_mob(user, C, 30))
+ return
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ var/obj/item/safe_thing = null
- if(reagents.total_volume)
+ if(H.glasses)
+ safe_thing = H.glasses
+ if(H.wear_mask )
+ if(H.wear_mask.flags_cover & MASKCOVERSEYES)
+ safe_thing = H.wear_mask
+ if(H.head)
+ if(H.head.flags_cover & MASKCOVERSEYES)
+ safe_thing = H.head
- if(target.reagents.total_volume >= target.reagents.maximum_volume)
- to_chat(user, "[target] is full.")
+ if(safe_thing)
+ visible_message("[user] tries to drip something into [H]'s eyes, but fails!")
+
+ reagents.reaction(safe_thing, TOUCH)
+ to_transfer = reagents.remove_any(amount_per_transfer_from_this)
+
+ to_chat(user, "You transfer [to_transfer] units of the solution.")
+ return
+
+ visible_message("[user] drips something into [C]'s eyes!")
+ reagents.reaction(C, TOUCH)
+
+ var/list/injected = list()
+ for(var/datum/reagent/R in reagents.reagent_list)
+ injected += R.name
+ var/contained = english_list(injected)
+ add_logs(user, C, "dripped", src, "([contained])")
+
+ to_transfer = reagents.trans_to(C, amount_per_transfer_from_this)
+ to_chat(user, "You transfer [to_transfer] units of the solution.")
+
+ if(isobj(target))
+ if(!target.reagents)
return
- if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/cigarette)) //You can inject humans and food but you cant remove the shit.
- to_chat(user, "You cannot directly fill this object.")
- return
+ if(reagents.total_volume)
+ if(!target.is_open_container() && !(istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/weapon/reagent_containers/food/pill)) && !istype(target, /obj/item/clothing/mask/cigarette))
+ to_chat(user, "You cannot directly fill this object.")
+ return
- var/trans = 0
+ if(target.reagents.total_volume >= target.reagents.maximum_volume)
+ to_chat(user, "[target] is full.")
+ return
- if(ismob(target))
- if(istype(target , /mob/living/carbon/human))
- var/mob/living/carbon/human/victim = target
+ to_transfer = reagents.trans_to(target, amount_per_transfer_from_this)
+ to_chat(user, "You transfer [to_transfer] units of the solution.")
- var/obj/item/safe_thing = null
- if( victim.wear_mask )
- if(victim.wear_mask.flags_cover & MASKCOVERSEYES)
- safe_thing = victim.wear_mask
- if( victim.head )
- if(victim.head.flags_cover & MASKCOVERSEYES)
- safe_thing = victim.head
- if(victim.glasses)
- if( !safe_thing )
- safe_thing = victim.glasses
+ else
+ if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers))
+ to_chat(user, "You cannot directly remove reagents from [target].")
+ return
- if(safe_thing)
- if(!safe_thing.reagents)
- safe_thing.create_reagents(100)
- trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this)
+ if(!target.reagents.total_volume)
+ to_chat(user, "[target] is empty.")
+ return
- visible_message("[user] tries to squirt something into [victim]'s eyes, but fails!")
- spawn(5)
- reagents.reaction(safe_thing, TOUCH)
+ to_transfer = target.reagents.trans_to(src, amount_per_transfer_from_this)
- to_chat(user, "You transfer [trans] units of the solution.")
- return
-
-
- visible_message("[user] squirts something into [target]'s eyes!")
- reagents.reaction(target, TOUCH)
-
- var/mob/living/M = target
-
- var/list/injected = list()
- for(var/datum/reagent/R in reagents.reagent_list)
- injected += R.name
- var/contained = english_list(injected)
- M.create_attack_log("Has been squirted with [name] by [key_name(user)]. Reagents: [contained]")
- user.create_attack_log("Used the [name] to squirt [key_name(M)]. Reagents: [contained]")
- if(M.ckey)
- msg_admin_attack("[key_name_admin(user)] squirted [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
- if(!iscarbon(user))
- M.LAssailant = null
- else
- M.LAssailant = user
-
- trans = reagents.trans_to(target, amount_per_transfer_from_this)
- to_chat(user, "You transfer [trans] units of the solution.")
-
- else
-
- if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
- to_chat(user, "You cannot directly remove reagents from [target].")
- return
-
- if(!target.reagents.total_volume)
- to_chat(user, "[target] is empty.")
- return
-
- var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
-
- to_chat(user, "You fill [src] with [trans] units of the solution.")
+ to_chat(user, "You fill [src] with [to_transfer] units of the solution.")
/obj/item/weapon/reagent_containers/dropper/cyborg
name = "Industrial Dropper"
desc = "A larger dropper. Transfers 10 units."
amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(1,2,3,4,5,6,7,8,9,10)
+ possible_transfer_amounts = list(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
volume = 10
-////////////////////////////////////////////////////////////////////////////////
-/// Droppers. END
-////////////////////////////////////////////////////////////////////////////////
-
/obj/item/weapon/reagent_containers/dropper/precision
name = "pipette"
desc = "A high precision pippette. Holds 1 unit."
- icon = 'icons/obj/chemical.dmi'
icon_state = "pipette"
amount_per_transfer_from_this = 1
- possible_transfer_amounts = list(0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1)
+ possible_transfer_amounts = list(0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1)
volume = 1
\ No newline at end of file
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 961edb70450..6a97d71ed68 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -467,6 +467,7 @@
I.loc = src
for(var/mob/M in viewers(src))
M.show_message("\the [I] lands in \the [src].", 3)
+ update()
else
for(var/mob/M in viewers(src))
M.show_message("\the [I] bounces off of \the [src]'s rim!.", 3)
diff --git a/code/modules/space_management/space_chunk.dm b/code/modules/space_management/space_chunk.dm
index e139394e963..28432bd21bb 100644
--- a/code/modules/space_management/space_chunk.dm
+++ b/code/modules/space_management/space_chunk.dm
@@ -28,9 +28,7 @@
set_occupied(FALSE)
if(parent)
parent.children -= src
- for(var/datum/space_chunk/child in children)
- qdel(child)
- children.Cut()
+ QDEL_LIST(children)
parent = null
. = ..()
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index d77455cd8e7..977899a3195 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -131,8 +131,8 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
var/obj/machinery/parent
/obj/structure/filler/ex_act()
- return
-
+ return
+
/obj/machinery/dna_vault
name = "DNA Vault"
desc = "Break glass in case of apocalypse."
@@ -177,7 +177,7 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
plants_max = G.plant_count
dna_max = G.human_count
break
-
+
..()
/obj/machinery/dna_vault/Destroy()
@@ -185,13 +185,14 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
var/obj/structure/filler/filler = V
filler.parent = null
qdel(filler)
+ fillers.Cut()
. = ..()
-
+
/obj/machinery/dna_vault/attack_ghost(mob/user)
if(stat & (BROKEN|MAINT))
return
return ui_interact(user)
-
+
/obj/machinery/dna_vault/attack_hand(mob/user)
if(..())
return 1
@@ -296,7 +297,7 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
grant_power(H, JUMPBLOCK, JUMPY)
grant_power(H, INCREASERUNBLOCK, RUN)
power_lottery[H] = list()
-
+
/obj/machinery/dna_vault/proc/grant_power(mob/living/carbon/human/H, block, power)
H.dna.SetSEState(block, 1, 1)
H.mutations |= power
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index fa955c8ea98..151636a9a50 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -96,9 +96,7 @@
if(owner)
owner.bodyparts_by_name[limb_name] = null
- if(children)
- for(var/obj/item/organ/external/C in children)
- qdel(C)
+ QDEL_LIST(children)
if(wound_cleanup_timer)
deltimer(wound_cleanup_timer)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index aa65b6337d5..9caaee5187c 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -38,7 +38,7 @@
/obj/machinery/computer/telescience/Destroy()
eject()
if(inserted_gps)
- inserted_gps.loc = loc
+ inserted_gps.forceMove(loc)
inserted_gps = null
return ..()
diff --git a/config/example/jobs.txt b/config/example/jobs.txt
index 060cf2d6a73..962803ab886 100644
--- a/config/example/jobs.txt
+++ b/config/example/jobs.txt
@@ -24,7 +24,7 @@ Shaft Miner=3
Warden=1
Detective=1
-Security Officer=5
+Security Officer=7
Assistant=-1
Atmospheric Technician=4
diff --git a/html/changelog.html b/html/changelog.html
index 56f7dd73502..0ccd2de953d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,7 +55,76 @@
-->
+
15 May 2017
+
TullyBurnalot updated:
+
+ - Disposal Bin Light now works with thrown items
+ - Fixes typos with cowboy items
+
+
+
13 May 2017
+
Fethas updated:
+
+ - fixes a redundent add_cultist proc so cult memorize objectives works on new converts.
+ - fixes an istype with IS_GAMEMODE_CULT
+ - Narsie now will sometimes make a door a cult door..i thought i had that in the first time.
+ - runed metal can now be only used on cult girders.
+
+
KasparoVy updated:
+
+ - Fixes a sprite issue with the Unathi Dorsal Frill's webbing.
+
+
+
12 May 2017
+
Fethas updated:
+
+ - Makes thrall examine use MASKCOVERMOUTH and HIDEFACE flags
+ - fixes hudsunglass goof with vox.
+
+
Xantholne updated:
+
+ - Changes name from dark brown to brown for the default cowboy boots
+ - Gives a hint that the cowboy shirts are meant to be clipped on to your uniform
+
+
+
11 May 2017
+
Fethas updated:
+
+ - Greybarber suit sprite.
+ - Removes sec access from the paramedic
+
+
Fox McCloud updated:
+
+ - can no longer make lethal medical patches with droppers
+ - dripping reagents on someone with a dropper now incurs a 3 second delay like syringes
+
+
+
09 May 2017
+
Fethas updated:
+
+ - a ton of grey clothing sprites.
+
+
+
08 May 2017
+
Purpose2 updated:
+
+ - Adds a wire to the modular console on the bridge, fixing the Power Grid program.
+
+
uraniummeltdown updated:
+
+ - Examine a reinforced wall for deconstruction and repair hints.
+
+
07 May 2017
+
GunDOSMk1 updated:
+
+ - Adds Unathi cobra hood
+
+
Purpose2 updated:
+
+ - Fixes the broken wiring re-electrifying the bridge window.
+ - Adds the missing scrubber in Genetics holding pen
+
Twinmold updated:
- No longer able to put grabs into kitchen equipment (deep-fried grab).
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e29fcc2c872..58929afe162 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4620,6 +4620,50 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
uraniummeltdown:
- rscdel: Removed Robocop, Paladin, NT Default as roundstart lawsets.
2017-05-07:
+ GunDOSMk1:
+ - rscadd: Adds Unathi cobra hood
+ Purpose2:
+ - bugfix: Fixes the broken wiring re-electrifying the bridge window.
+ - bugfix: Adds the missing scrubber in Genetics holding pen
Twinmold:
- bugfix: No longer able to put grabs into kitchen equipment (deep-fried grab).
- bugfix: No longer able to put grabs inside of display cases.
+2017-05-08:
+ Purpose2:
+ - rscadd: Adds a wire to the modular console on the bridge, fixing the Power Grid
+ program.
+ uraniummeltdown:
+ - rscadd: Examine a reinforced wall for deconstruction and repair hints.
+2017-05-09:
+ Fethas:
+ - rscadd: a ton of grey clothing sprites.
+2017-05-11:
+ Fethas:
+ - bugfix: Greybarber suit sprite.
+ - tweak: Removes sec access from the paramedic
+ Fox McCloud:
+ - bugfix: can no longer make lethal medical patches with droppers
+ - tweak: dripping reagents on someone with a dropper now incurs a 3 second delay
+ like syringes
+2017-05-12:
+ Fethas:
+ - bugfix: Makes thrall examine use MASKCOVERMOUTH and HIDEFACE flags
+ - bugfix: fixes hudsunglass goof with vox.
+ Xantholne:
+ - bugfix: Changes name from dark brown to brown for the default cowboy boots
+ - bugfix: Gives a hint that the cowboy shirts are meant to be clipped on to your
+ uniform
+2017-05-13:
+ Fethas:
+ - bugfix: fixes a redundent add_cultist proc so cult memorize objectives works on
+ new converts.
+ - bugfix: fixes an istype with IS_GAMEMODE_CULT
+ - bugfix: Narsie now will sometimes make a door a cult door..i thought i had that
+ in the first time.
+ - bugfix: runed metal can now be only used on cult girders.
+ KasparoVy:
+ - bugfix: Fixes a sprite issue with the Unathi Dorsal Frill's webbing.
+2017-05-15:
+ TullyBurnalot:
+ - bugfix: Disposal Bin Light now works with thrown items
+ - bugfix: Fixes typos with cowboy items
diff --git a/html/changelogs/AutoChangeLog-pr-6604.yml b/html/changelogs/AutoChangeLog-pr-6604.yml
new file mode 100644
index 00000000000..23d01a68933
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6604.yml
@@ -0,0 +1,4 @@
+author: "Kyep"
+delete-after: True
+changes:
+ - tweak: "changed security officer job slots from 5 to 7."
diff --git a/html/changelogs/AutoChangeLog-pr-7169.yml b/html/changelogs/AutoChangeLog-pr-7169.yml
new file mode 100644
index 00000000000..48cbc776218
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7169.yml
@@ -0,0 +1,5 @@
+author: "uraniummeltdown"
+delete-after: True
+changes:
+ - tweak: "You can now resist out of straightjackets"
+ - tweak: "Straightjacketed people can be handcuffed"
diff --git a/html/changelogs/AutoChangeLog-pr-7305.yml b/html/changelogs/AutoChangeLog-pr-7305.yml
new file mode 100644
index 00000000000..f3925a2b5ce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7305.yml
@@ -0,0 +1,4 @@
+author: "FlattestGuitar"
+delete-after: True
+changes:
+ - tweak: "Brig lockers now have radios and prisoner IDs. As per SOP!"
diff --git a/icons/NTOS/airestore.png b/icons/NTOS/airestore.png
deleted file mode 100644
index d8e5207bfbf..00000000000
Binary files a/icons/NTOS/airestore.png and /dev/null differ
diff --git a/icons/NTOS/aiupload.png b/icons/NTOS/aiupload.png
deleted file mode 100644
index 25a8d8694e3..00000000000
Binary files a/icons/NTOS/aiupload.png and /dev/null differ
diff --git a/icons/NTOS/alerts.png b/icons/NTOS/alerts.png
deleted file mode 100644
index d395428c7cd..00000000000
Binary files a/icons/NTOS/alerts.png and /dev/null differ
diff --git a/icons/NTOS/battery_icons/batt_100.gif b/icons/NTOS/battery_icons/batt_100.gif
deleted file mode 100644
index 72f04cff011..00000000000
Binary files a/icons/NTOS/battery_icons/batt_100.gif and /dev/null differ
diff --git a/icons/NTOS/battery_icons/batt_20.gif b/icons/NTOS/battery_icons/batt_20.gif
deleted file mode 100644
index cc56e28214f..00000000000
Binary files a/icons/NTOS/battery_icons/batt_20.gif and /dev/null differ
diff --git a/icons/NTOS/battery_icons/batt_40.gif b/icons/NTOS/battery_icons/batt_40.gif
deleted file mode 100644
index 5d03a30c18e..00000000000
Binary files a/icons/NTOS/battery_icons/batt_40.gif and /dev/null differ
diff --git a/icons/NTOS/battery_icons/batt_5.gif b/icons/NTOS/battery_icons/batt_5.gif
deleted file mode 100644
index eddcc6ae824..00000000000
Binary files a/icons/NTOS/battery_icons/batt_5.gif and /dev/null differ
diff --git a/icons/NTOS/battery_icons/batt_60.gif b/icons/NTOS/battery_icons/batt_60.gif
deleted file mode 100644
index 2a159b8e3c3..00000000000
Binary files a/icons/NTOS/battery_icons/batt_60.gif and /dev/null differ
diff --git a/icons/NTOS/battery_icons/batt_80.gif b/icons/NTOS/battery_icons/batt_80.gif
deleted file mode 100644
index 59efcb225e1..00000000000
Binary files a/icons/NTOS/battery_icons/batt_80.gif and /dev/null differ
diff --git a/icons/NTOS/battery_icons/batt_none.gif b/icons/NTOS/battery_icons/batt_none.gif
deleted file mode 100644
index 64aa24516b3..00000000000
Binary files a/icons/NTOS/battery_icons/batt_none.gif and /dev/null differ
diff --git a/icons/NTOS/borgcontrol.png b/icons/NTOS/borgcontrol.png
deleted file mode 100644
index 63e0815954c..00000000000
Binary files a/icons/NTOS/borgcontrol.png and /dev/null differ
diff --git a/icons/NTOS/borgupload.png b/icons/NTOS/borgupload.png
deleted file mode 100644
index dfb24cecfdb..00000000000
Binary files a/icons/NTOS/borgupload.png and /dev/null differ
diff --git a/icons/NTOS/camera.png b/icons/NTOS/camera.png
deleted file mode 100644
index a9a726b03d4..00000000000
Binary files a/icons/NTOS/camera.png and /dev/null differ
diff --git a/icons/NTOS/cardcomp.png b/icons/NTOS/cardcomp.png
deleted file mode 100644
index e7df0ab2071..00000000000
Binary files a/icons/NTOS/cardcomp.png and /dev/null differ
diff --git a/icons/NTOS/cloning.png b/icons/NTOS/cloning.png
deleted file mode 100644
index 6fa29425056..00000000000
Binary files a/icons/NTOS/cloning.png and /dev/null differ
diff --git a/icons/NTOS/comms.png b/icons/NTOS/comms.png
deleted file mode 100644
index e089889d930..00000000000
Binary files a/icons/NTOS/comms.png and /dev/null differ
diff --git a/icons/NTOS/copyfile.png b/icons/NTOS/copyfile.png
deleted file mode 100644
index 50c10b37578..00000000000
Binary files a/icons/NTOS/copyfile.png and /dev/null differ
diff --git a/icons/NTOS/deletefile.png b/icons/NTOS/deletefile.png
deleted file mode 100644
index ada175fad25..00000000000
Binary files a/icons/NTOS/deletefile.png and /dev/null differ
diff --git a/icons/NTOS/drive.png b/icons/NTOS/drive.png
deleted file mode 100644
index 69ca021f8b7..00000000000
Binary files a/icons/NTOS/drive.png and /dev/null differ
diff --git a/icons/NTOS/exocontrol.png b/icons/NTOS/exocontrol.png
deleted file mode 100644
index 101f32e44db..00000000000
Binary files a/icons/NTOS/exocontrol.png and /dev/null differ
diff --git a/icons/NTOS/file.png b/icons/NTOS/file.png
deleted file mode 100644
index 05556e01f80..00000000000
Binary files a/icons/NTOS/file.png and /dev/null differ
diff --git a/icons/NTOS/folder.png b/icons/NTOS/folder.png
deleted file mode 100644
index 05780bc651c..00000000000
Binary files a/icons/NTOS/folder.png and /dev/null differ
diff --git a/icons/NTOS/foldermeta.png b/icons/NTOS/foldermeta.png
deleted file mode 100644
index 0d7a26b943f..00000000000
Binary files a/icons/NTOS/foldermeta.png and /dev/null differ
diff --git a/icons/NTOS/genetics.png b/icons/NTOS/genetics.png
deleted file mode 100644
index 6f5b2320fc2..00000000000
Binary files a/icons/NTOS/genetics.png and /dev/null differ
diff --git a/icons/NTOS/medical.png b/icons/NTOS/medical.png
deleted file mode 100644
index a3b6a21b54b..00000000000
Binary files a/icons/NTOS/medical.png and /dev/null differ
diff --git a/icons/NTOS/monitoring.png b/icons/NTOS/monitoring.png
deleted file mode 100644
index a94910e48a0..00000000000
Binary files a/icons/NTOS/monitoring.png and /dev/null differ
diff --git a/icons/NTOS/movefile.png b/icons/NTOS/movefile.png
deleted file mode 100644
index 5b31c6c2a88..00000000000
Binary files a/icons/NTOS/movefile.png and /dev/null differ
diff --git a/icons/NTOS/ntos.png b/icons/NTOS/ntos.png
deleted file mode 100644
index 8b9d735cc99..00000000000
Binary files a/icons/NTOS/ntos.png and /dev/null differ
diff --git a/icons/NTOS/operating.png b/icons/NTOS/operating.png
deleted file mode 100644
index ab8f65ef7a8..00000000000
Binary files a/icons/NTOS/operating.png and /dev/null differ
diff --git a/icons/NTOS/pda.png b/icons/NTOS/pda.png
deleted file mode 100644
index c6b0bb00fb3..00000000000
Binary files a/icons/NTOS/pda.png and /dev/null differ
diff --git a/icons/NTOS/power.png b/icons/NTOS/power.png
deleted file mode 100644
index b2e4cc837f1..00000000000
Binary files a/icons/NTOS/power.png and /dev/null differ
diff --git a/icons/NTOS/prison.png b/icons/NTOS/prison.png
deleted file mode 100644
index a846fe00411..00000000000
Binary files a/icons/NTOS/prison.png and /dev/null differ
diff --git a/icons/NTOS/program.png b/icons/NTOS/program.png
deleted file mode 100644
index ac161287636..00000000000
Binary files a/icons/NTOS/program.png and /dev/null differ
diff --git a/icons/NTOS/records.png b/icons/NTOS/records.png
deleted file mode 100644
index eaaf68e50d1..00000000000
Binary files a/icons/NTOS/records.png and /dev/null differ
diff --git a/icons/NTOS/research.png b/icons/NTOS/research.png
deleted file mode 100644
index 5ebd63aafcc..00000000000
Binary files a/icons/NTOS/research.png and /dev/null differ
diff --git a/icons/NTOS/server.png b/icons/NTOS/server.png
deleted file mode 100644
index 6d96b114139..00000000000
Binary files a/icons/NTOS/server.png and /dev/null differ
diff --git a/icons/NTOS/tb_close.png b/icons/NTOS/tb_close.png
deleted file mode 100644
index b99a6d81542..00000000000
Binary files a/icons/NTOS/tb_close.png and /dev/null differ
diff --git a/icons/NTOS/tcomms.png b/icons/NTOS/tcomms.png
deleted file mode 100644
index a63b23c8dff..00000000000
Binary files a/icons/NTOS/tcomms.png and /dev/null differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index d516d5f1983..09b1f1f79ba 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 659c3d2e9d2..2dd84b4117c 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index acfaf83a92c..3764c64aa50 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 4959f0ebb53..b507d77eeb9 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 2edbeefab9e..62948a933ed 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/species/grey/eyes.dmi
new file mode 100644
index 00000000000..929facc86b7
Binary files /dev/null and b/icons/mob/species/grey/eyes.dmi differ
diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/species/grey/mask.dmi
index 27785b33141..7a64321ed42 100644
Binary files a/icons/mob/species/grey/mask.dmi and b/icons/mob/species/grey/mask.dmi differ
diff --git a/icons/mob/species/grey/suit.dmi b/icons/mob/species/grey/suit.dmi
new file mode 100644
index 00000000000..3d61d72dec8
Binary files /dev/null and b/icons/mob/species/grey/suit.dmi differ
diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/species/grey/uniform.dmi
new file mode 100644
index 00000000000..ce62fffd4e3
Binary files /dev/null and b/icons/mob/species/grey/uniform.dmi differ
diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/species/vox/shoes.dmi
index 83d6b9870ce..45f664c715a 100644
Binary files a/icons/mob/species/vox/shoes.dmi and b/icons/mob/species/vox/shoes.dmi differ
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi
index 4584f489ca6..b0e9f61d7bf 100644
Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index e557ed1c87e..891f725aa07 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 0aece3ac8ac..b82450ab87a 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index b92c02e7166..3631097a2ba 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index cc83ea5d9ec..a894b1b2465 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index 91432c14d1a..97a11d05cad 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 5187f8f2f78..f556e631a4c 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 90e484bf1e4..2b1a4cf4eda 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1223,35 +1223,6 @@
#include "code\modules\clothing\under\jobs\engineering.dm"
#include "code\modules\clothing\under\jobs\medsci.dm"
#include "code\modules\clothing\under\jobs\security.dm"
-#include "code\modules\computer3\bios.dm"
-#include "code\modules\computer3\buildandrepair.dm"
-#include "code\modules\computer3\component.dm"
-#include "code\modules\computer3\computer.dm"
-#include "code\modules\computer3\computer3_notes.dm"
-#include "code\modules\computer3\file.dm"
-#include "code\modules\computer3\laptop.dm"
-#include "code\modules\computer3\networking.dm"
-#include "code\modules\computer3\NTOS.dm"
-#include "code\modules\computer3\program.dm"
-#include "code\modules\computer3\program_disks.dm"
-#include "code\modules\computer3\server.dm"
-#include "code\modules\computer3\storage.dm"
-#include "code\modules\computer3\computers\arcade.dm"
-#include "code\modules\computer3\computers\atmos_alert.dm"
-#include "code\modules\computer3\computers\camera.dm"
-#include "code\modules\computer3\computers\card.dm"
-#include "code\modules\computer3\computers\communications.dm"
-#include "code\modules\computer3\computers\crew.dm"
-#include "code\modules\computer3\computers\customs.dm"
-#include "code\modules\computer3\computers\HolodeckControl.dm"
-#include "code\modules\computer3\computers\law.dm"
-#include "code\modules\computer3\computers\medical.dm"
-#include "code\modules\computer3\computers\Operating.dm"
-#include "code\modules\computer3\computers\power.dm"
-#include "code\modules\computer3\computers\prisoner.dm"
-#include "code\modules\computer3\computers\robot.dm"
-#include "code\modules\computer3\computers\security.dm"
-#include "code\modules\computer3\computers\welcome.dm"
#include "code\modules\countdown\countdown.dm"
#include "code\modules\crafting\craft.dm"
#include "code\modules\crafting\guncrafting.dm"
"
- if(0 to 5)
- dat += "
"
- if(6 to 20)
- dat += "
"
- if(21 to 40)
- dat += "
"
- if(41 to 60)
- dat += "
"
- if(61 to 80)
- dat += "
"
- if(81 to 100)
- dat += "
"
- dat += "