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 7a9620a1d1a..7ec69377a1d 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -363,11 +363,54 @@
#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
+ sallet.visor_flags = helm.visor_flags
+ sallet.visor_flags_inv = helm.visor_flags_inv
+ if(!(BLOCKHAIR in sallet.flags))
+ sallet.flags |= BLOCKHAIR
+
+ 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
@@ -441,6 +484,54 @@
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]
+ icon_state = new_state["icon_state"]
+ state = choice
+ 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'
@@ -812,21 +903,3 @@
icon_state = options[choice]
to_chat(user, "Your strange witch hat has now shapeshifted into it's [choice] form!")
return 1
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/fluff/moonshine //nethiafins : Serhij Zozulia
- name = "Cloudy Bottle"
- desc = "The contents of this bottle are vile. You should only drink it when you hit rock bottom."
- icon = 'icons/obj/custom_items.dmi'
- icon_state = "questionable_liquid"
- item_state = "questionable_liquid"
- amount_per_transfer_from_this = 5
- list_reagents = list("moonshine" = 100)
-
-/obj/item/weapon/storage/box/fluff/moonshine_kit //nethiafins : Serhij Zozulia
- name = "Moonshine Serving box"
-
-/obj/item/weapon/storage/box/fluff/moonshine_kit/New()
- ..()
- new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
- new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
- new /obj/item/weapon/reagent_containers/food/drinks/bottle/fluff/moonshine(src)
diff --git a/code/modules/fancytitle/fancytitle.dm b/code/modules/fancytitle/fancytitle.dm
new file mode 100644
index 00000000000..e445024aae1
--- /dev/null
+++ b/code/modules/fancytitle/fancytitle.dm
@@ -0,0 +1,33 @@
+/hook/startup/proc/setup_title_screen()
+ var/list/provisional_title_screens = flist("config/title_screens/images/")
+ var/list/title_screens = list()
+ var/use_rare_screens = prob(1)
+
+ for(var/S in provisional_title_screens)
+ var/list/L = splittext(S,"+")
+ if(L.len == 1 && L[1] != "blank.png")
+ title_screens += S
+
+ else if(L.len > 1)
+ if(use_rare_screens && lowertext(L[1]) == "rare")
+ title_screens += S
+ else if(lowertext(L[1]) == lowertext(MAP_NAME))
+ title_screens += S
+
+ if(!isemptylist(title_screens))
+ if(length(title_screens) > 1)
+ for(var/S in title_screens)
+ var/list/L = splittext(S,".")
+ if(L.len != 2 || L[1] != "default")
+ continue
+ title_screens -= S
+ break
+
+ var/file_path = "config/title_screens/images/[pick(title_screens)]"
+
+ var/icon/icon = new(fcopy_rsc(file_path))
+
+ for(var/turf/unsimulated/wall/splashscreen/splash in world)
+ splash.icon = icon
+ return TRUE
+ return FALSE
\ No newline at end of file
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/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 1781479ec6c..5862de7d6ca 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -61,7 +61,7 @@
head.disfigure("burn")
add_logs(user, G.affecting, "deep-fried", addition="'s face")
qdel(G) //Removes the grip so the person MIGHT have a small chance to run the fuck away and to prevent rapid dunks.
- return 1
+ return 0
return 0
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 908411f5731..efdd173bed9 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.
@@ -122,7 +123,7 @@
return
if(!ishuman(victim) || issmall(victim))
- to_chat(user, "This is not suitable for the [src]]!")
+ to_chat(user, "This is not suitable for the [src]!")
return
if(victim.abiotic(1))
@@ -132,7 +133,7 @@
user.visible_message("[user] starts to put [victim] into the [src]!")
add_fingerprint(user)
if(do_after(user, 30, target = victim) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
- user.visible_message("[user] stuffs [victim] into the [src]]!")
+ user.visible_message("[user] stuffs [victim] into the [src]!")
victim.forceMove(src)
occupant = victim
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm b/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
index d63971dcc30..1a1dd34196d 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
@@ -57,5 +57,5 @@
C.adjustFireLoss(30)
add_logs(user, G.affecting, "burned", src)
qdel(G) //Removes the grip to prevent rapid sears and give you a chance to run
- return 1
+ return 0
return 0
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm b/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
index bd850288bc4..5c1ed4ac6df 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
@@ -63,5 +63,5 @@
C.Weaken(2)
add_logs(user, G.affecting, "smashed", addition="'s head on [src]")
qdel(G) //Removes the grip to prevent rapid bashes. With the weaken, you PROBABLY can't run unless they are slow to grab you again...
- return 1
+ return 0
return 0
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/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 18f87a8a45a..7bfa00d35c3 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -51,11 +51,13 @@
/obj/structure/beebox/Destroy()
processing_objects.Remove(src)
+ for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
+ B.beehome = null
bees.Cut()
bees = null
- honeycombs.Cut()
- honeycombs = null
- queen_bee = null
+ QDEL_LIST(honeycombs)
+ QDEL_LIST(honey_frames)
+ QDEL_NULL(queen_bee)
return ..()
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 7e7aa825411..7c5297e07c4 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -75,6 +75,7 @@
plant_hud_set_water()
/obj/machinery/hydroponics/Destroy()
+ remove_from_all_data_huds()
QDEL_NULL(myseed)
return ..()
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index 379a15a296a..7f2c3587349 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -44,7 +44,7 @@
icon_state = "sextractor"
density = 1
anchored = 1
- var/piles = list()
+ var/list/piles = list()
var/max_seeds = 1000
var/seed_multiplier = 1
@@ -56,6 +56,10 @@
component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
RefreshParts()
+/obj/machinery/seed_extractor/Destroy()
+ QDEL_LIST(piles)
+ return ..()
+
/obj/machinery/seed_extractor/RefreshParts()
for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
max_seeds = 1000 * B.rating
@@ -125,14 +129,14 @@
/obj/machinery/seed_extractor/attack_hand(mob/user)
interact(user)
-
+
/obj/machinery/seed_extractor/attack_ghost(mob/user)
interact(user)
/obj/machinery/seed_extractor/interact(mob/user)
if(stat)
return 0
-
+
add_fingerprint(user)
user.set_machine(src)
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 9aa93f9f92b..ae79eda23d3 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -69,9 +69,7 @@
genes += new /datum/plant_gene/reagent(reag_id, reagents_add[reag_id])
/obj/item/seeds/Destroy()
- for(var/thing in genes)
- qdel(thing)
- genes.Cut()
+ QDEL_LIST(genes)
return ..()
/obj/item/seeds/proc/Copy()
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/autohiss.dm b/code/modules/mob/living/autohiss.dm
index 4506ce50cfb..da19b6a35b2 100644
--- a/code/modules/mob/living/autohiss.dm
+++ b/code/modules/mob/living/autohiss.dm
@@ -1,29 +1,18 @@
-
-#define AUTOHISS_OFF 0
-#define AUTOHISS_BASIC 1
-#define AUTOHISS_FULL 2
-
-#define AUTOHISS_NUM 3
-
-
/mob/living/proc/handle_autohiss(message, datum/language/L)
return message // no autohiss at this level
/mob/living/carbon/human/handle_autohiss(message, datum/language/L)
- if(!client || client.autohiss_mode == AUTOHISS_OFF) // no need to process if there's no client or they have autohiss off
+ if(!client || client.prefs.autohiss_mode == AUTOHISS_OFF) // no need to process if there's no client or they have autohiss off
return message
- return species.handle_autohiss(message, L, client.autohiss_mode)
-
-/client
- var/autohiss_mode = AUTOHISS_OFF
+ return species.handle_autohiss(message, L, client.prefs.autohiss_mode)
/client/verb/toggle_autohiss()
set name = "Toggle Auto-Accent"
set desc = "Toggle automatic accents for your species"
set category = "OOC"
- autohiss_mode = (autohiss_mode + 1) % AUTOHISS_NUM
- switch(autohiss_mode)
+ prefs.autohiss_mode = (prefs.autohiss_mode + 1) % AUTOHISS_NUM
+ switch(prefs.autohiss_mode)
if(AUTOHISS_OFF)
to_chat(src, "Auto-hiss is now OFF.")
if(AUTOHISS_BASIC)
@@ -31,7 +20,7 @@
if(AUTOHISS_FULL)
to_chat(src, "Auto-hiss is now FULL.")
else
- autohiss_mode = AUTOHISS_OFF
+ prefs.autohiss_mode = AUTOHISS_OFF
to_chat(src, "Auto-hiss is now OFF.")
/datum/species
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 93f2d4aeb35..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 ..()
@@ -219,7 +217,7 @@
"You check yourself for injuries." \
)
- for(var/obj/item/organ/external/org in H.organs)
+ for(var/obj/item/organ/external/org in H.bodyparts)
var/status = ""
var/brutedamage = org.brute_dam
var/burndamage = org.burn_dam
@@ -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/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index 3cedf2d1f3f..e365f870fca 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -15,7 +15,7 @@
return 1
/mob/living/carbon/human/proc/change_gender(var/new_gender, var/update_dna = 1)
- var/obj/item/organ/external/head/H = organs_by_name["head"]
+ var/obj/item/organ/external/head/H = bodyparts_by_name["head"]
if(gender == new_gender || (gender == PLURAL && species.has_gender))
return
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 2300f25768e..b3580778d22 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -22,7 +22,7 @@
spawn()
thing.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
- for(var/obj/item/organ/external/E in src.organs)
+ for(var/obj/item/organ/external/E in bodyparts)
if(istype(E, /obj/item/organ/external/chest))
continue
// Only make the limb drop if it's not too damaged
@@ -177,7 +177,7 @@
return
/mob/living/carbon/human/proc/ChangeToHusk()
- var/obj/item/organ/external/head/H = organs_by_name["head"]
+ var/obj/item/organ/external/head/H = bodyparts_by_name["head"]
if(HUSK in mutations) return
if(istype(H))
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index e88468e2018..1b15dccdc2c 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -45,7 +45,7 @@
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
found_slime_bodypart = 1
else
- for(var/obj/item/organ/external/L in organs) // if your limbs are squishy you can squish too!
+ for(var/obj/item/organ/external/L in bodyparts) // if your limbs are squishy you can squish too!
if(L.dna.species in list("Slime People"))
on_CD = handle_emote_CD()
found_slime_bodypart = 1
@@ -66,6 +66,12 @@
else //Everyone else fails, skip the emote attempt
return
+ if("hiss", "hisses")
+ if(species.name == "Unathi") //Only Unathi can hiss.
+ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
+ else //Everyone else fails, skip the emote attempt
+ return
+
if("scream", "screams")
on_CD = handle_emote_CD(50) //longer cooldown
if("fart", "farts", "flip", "flips", "snap", "snaps")
@@ -141,6 +147,13 @@
playsound(loc, 'sound/effects/Kidanclack2.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
m_type = 2
+ if("hiss", "hisses")
+ var/M = handle_emote_param(param)
+
+ message = "[src] hisses[M ? " at [M]" : ""]."
+ playsound(loc, 'sound/effects/unathihiss.ogg', 50, 0) //Credit to Jamius (freesound.org) for the sound.
+ m_type = 2
+
if("yes")
var/M = handle_emote_param(param)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 93d9a49d6df..693973ab42d 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -295,7 +295,7 @@
var/organ_descriptor = organ_data["descriptor"]
is_destroyed["[organ_data["descriptor"]]"] = 1
- var/obj/item/organ/external/E = organs_by_name[organ_tag]
+ var/obj/item/organ/external/E = bodyparts_by_name[organ_tag]
if(!E)
wound_flavor_text["[organ_tag]"] = "[t_He] [t_is] missing [t_his] [organ_descriptor].\n"
else if(E.is_stump())
@@ -303,7 +303,7 @@
else
continue
- for(var/obj/item/organ/external/temp in organs)
+ for(var/obj/item/organ/external/temp in bodyparts)
if(temp && !temp.is_stump())
if(temp.status & ORGAN_ROBOT)
if(!(temp.brute_dam + temp.burn_dam))
@@ -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 65cdd7c24d9..1c012655cdc 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -65,9 +65,7 @@
add_to_all_human_data_huds()
/mob/living/carbon/human/Destroy()
- for(var/atom/movable/organelle in organs)
- qdel(organelle)
- organs = list()
+ QDEL_LIST(bodyparts)
return ..()
/mob/living/carbon/human/dummy
@@ -310,7 +308,7 @@
var/limbs_affected = pick(2,3,4)
var/obj/item/organ/external/processing_dismember
- var/list/valid_limbs = organs.Copy()
+ var/list/valid_limbs = bodyparts.Copy()
while(limbs_affected != 0 && valid_limbs.len > 0)
processing_dismember = pick(valid_limbs)
@@ -328,7 +326,7 @@
var/limbs_affected = 0
var/obj/item/organ/external/processing_dismember
- var/list/valid_limbs = organs.Copy()
+ var/list/valid_limbs = bodyparts.Copy()
if(prob(getarmor(null, "bomb")))
b_loss = b_loss/1.5
@@ -361,7 +359,7 @@
var/limbs_affected = pick(0, 1)
var/obj/item/organ/external/processing_dismember
- var/list/valid_limbs = organs.Copy()
+ var/list/valid_limbs = bodyparts.Copy()
while(limbs_affected != 0 && valid_limbs.len > 0)
processing_dismember = pick(valid_limbs)
@@ -1263,20 +1261,20 @@
if(istype(organ, /obj/item/organ/external/stump)) //Get rid of all stumps.
qdel(organ)
H.contents -= organ //Making sure the list entry is removed.
- for(var/obj/item/organ/organ in H.organs)
+ for(var/obj/item/organ/organ in H.bodyparts)
if(istype(organ, /obj/item/organ/external/stump))
qdel(organ)
- H.organs -= organ //Making sure the list entry is removed.
- for(var/organ_name in H.organs_by_name)
- var/obj/item/organ/organ = H.organs_by_name[organ_name]
+ H.bodyparts -= organ //Making sure the list entry is removed.
+ for(var/organ_name in H.bodyparts_by_name)
+ var/obj/item/organ/organ = H.bodyparts_by_name[organ_name]
if(istype(organ, /obj/item/organ/external/stump) || !organ) //The !organ check is to account for mechanical limb (prostheses) losses, since those are handled in a way that leaves indexed but null list entries instead of stumps.
qdel(organ)
- H.organs_by_name -= organ_name //Making sure the list entry is removed.
+ H.bodyparts_by_name -= organ_name //Making sure the list entry is removed.
//Replacing lost limbs with the species default.
var/mob/living/carbon/human/temp_holder
for(var/limb_type in H.species.has_limbs)
- if(!(limb_type in H.organs_by_name))
+ if(!(limb_type in H.bodyparts_by_name))
var/list/organ_data = H.species.has_limbs[limb_type]
var/limb_path = organ_data["path"]
var/obj/item/organ/external/O = new limb_path(temp_holder)
@@ -1286,7 +1284,7 @@
else
O = new limb_path(H) //Create the limb on the player.
O.owner = H
- H.organs |= H.organs_by_name[O.limb_name]
+ H.bodyparts |= H.bodyparts_by_name[O.limb_name]
//Replacing lost organs with the species default.
temp_holder = new /mob/living/carbon/human()
@@ -1408,10 +1406,18 @@
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()
- for(var/obj/item/organ/external/organ in src.organs)
+ for(var/obj/item/organ/external/organ in bodyparts)
for(var/obj/item/weapon/O in organ.implants)
if(!istype(O,/obj/item/weapon/implant) && (O.w_class > class) && !istype(O,/obj/item/weapon/shard/shrapnel))
visible_implants += O
@@ -1427,7 +1433,7 @@
/mob/living/carbon/human/proc/handle_embedded_objects()
- for(var/obj/item/organ/external/organ in src.organs)
+ for(var/obj/item/organ/external/organ in bodyparts)
if(organ.status & ORGAN_SPLINTED) //Splints prevent movement.
continue
for(var/obj/item/weapon/O in organ.implants)
@@ -2052,7 +2058,7 @@
return .
/mob/living/carbon/human/proc/change_icobase(var/new_icobase, var/new_deform, var/owner_sensitive)
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
O.change_organ_icobase(new_icobase, new_deform, owner_sensitive) //Change the icobase/deform of all our organs. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
/mob/living/carbon/human/serialize()
@@ -2074,8 +2080,8 @@
data["uwear"] = underwear
// Limbs
- for(var/limb in organs_by_name)
- var/obj/item/organ/O = organs_by_name[limb]
+ for(var/limb in bodyparts_by_name)
+ var/obj/item/organ/O = bodyparts_by_name[limb]
if(!O)
limbs_list[limb] = "missing"
continue
@@ -2116,7 +2122,7 @@
for(var/obj/item/organ/internal/iorgan in internal_organs)
qdel(iorgan)
- for(var/obj/item/organ/external/organ in organs)
+ for(var/obj/item/organ/external/organ in bodyparts)
qdel(organ)
for(var/limb in limbs_list)
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 99df89de5c7..b0d2fb3e315 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -9,9 +9,9 @@
var/mob/living/carbon/human/H = M
if(istype(H))
- var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
+ var/obj/item/organ/external/temp = H.bodyparts_by_name["r_hand"]
if(H.hand)
- temp = H.organs_by_name["l_hand"]
+ temp = H.bodyparts_by_name["l_hand"]
if(!temp || !temp.is_usable())
to_chat(H, "You can't use your hand.")
return
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 1f8d86c6c15..04c8ffc9f57 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -8,7 +8,7 @@
var/total_burn = 0
var/total_brute = 0
- for(var/obj/item/organ/external/O in organs) //hardcoded to streamline things a bit
+ for(var/obj/item/organ/external/O in bodyparts) //hardcoded to streamline things a bit
total_brute += O.brute_dam //calculates health based on organ brute and burn
total_burn += O.burn_dam
@@ -77,13 +77,13 @@
//These procs fetch a cumulative total damage from all organs
/mob/living/carbon/human/getBruteLoss()
var/amount = 0
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
amount += O.brute_dam
return amount
/mob/living/carbon/human/getFireLoss()
var/amount = 0
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
amount += O.burn_dam
return amount
@@ -108,7 +108,7 @@
if(species)
amount = amount * species.brute_mod
- if(organ_name in organs_by_name)
+ if(organ_name in bodyparts_by_name)
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
@@ -122,7 +122,7 @@
if(species)
amount = amount * species.burn_mod
- if(organ_name in organs_by_name)
+ if(organ_name in bodyparts_by_name)
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
@@ -148,7 +148,7 @@
if(amount > 0) //cloneloss is being added
if(prob(mut_prob))
var/list/obj/item/organ/external/candidates = list() //TYPECASTED LISTS ARE NOT A FUCKING THING WHAT THE FUCK
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(O.status & ORGAN_ROBOT)
continue
if(!(O.status & ORGAN_MUTATED))
@@ -163,7 +163,7 @@
else //cloneloss is being subtracted
if(prob(heal_prob))
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(O.status & ORGAN_MUTATED)
O.unmutate()
to_chat(src, "Your [O.name] is shaped normally again.")
@@ -171,7 +171,7 @@
if(getCloneLoss() < 1) //no cloneloss, fixes organs
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(O.status & ORGAN_MUTATED)
O.unmutate()
to_chat(src, "Your [O.name] is shaped normally again.")
@@ -203,7 +203,7 @@
//Returns a list of damaged organs
/mob/living/carbon/human/proc/get_damaged_organs(brute, burn, flags = AFFECT_ALL_ORGANS)
var/list/obj/item/organ/external/parts = list()
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if((brute && O.brute_dam) || (burn && O.burn_dam))
if(!(flags & AFFECT_ROBOTIC_ORGAN) && O.status & ORGAN_ROBOT)
continue
@@ -215,7 +215,7 @@
//Returns a list of damageable organs
/mob/living/carbon/human/proc/get_damageable_organs()
var/list/obj/item/organ/external/parts = list()
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(O.brute_dam + O.burn_dam < O.max_damage)
parts += O
return parts
@@ -313,7 +313,7 @@ This function restores the subjects blood to max.
This function restores all organs.
*/
/mob/living/carbon/human/restore_all_organs()
- for(var/obj/item/organ/external/current_organ in organs)
+ for(var/obj/item/organ/external/current_organ in bodyparts)
current_organ.rejuvenate()
/mob/living/carbon/human/proc/HealDamage(zone, brute, burn)
@@ -331,7 +331,7 @@ This function restores all organs.
if(zone in list("eyes", "mouth"))
zone = "head"
- return organs_by_name[zone]
+ return bodyparts_by_name[zone]
/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = 0, sharp = 0, edge = 0, obj/used_weapon = null)
//Handle other types of damage
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 029c207a2d8..3f25873e5f2 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -83,7 +83,7 @@ emp_act
//If a specific bodypart is targetted, check how that bodypart is protected and return the value.
//If you don't specify a bodypart, it checks ALL your bodyparts for protection, and averages out the values
- for(var/obj/item/organ/external/organ in organs)
+ for(var/obj/item/organ/external/organ in bodyparts)
armorval += getarmor_organ(organ, type)
organnum++
@@ -100,8 +100,8 @@ emp_act
if(bp && istype(bp ,/obj/item/clothing))
var/obj/item/clothing/C = bp
if(C.body_parts_covered & def_zone.body_part)
- protection += C.armor[type]
-
+ protection += C.armor[type]
+
return protection
//this proc returns the Siemens coefficient of electrical resistivity for a particular external organ.
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 2f07fdacd07..5ae7547be58 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -4,8 +4,8 @@
eyes.update_colour()
update_body()
-/mob/living/carbon/human/var/list/organs = list()
-/mob/living/carbon/human/var/list/organs_by_name = list() // map organ names to organs
+/mob/living/carbon/human/var/list/bodyparts = list()
+/mob/living/carbon/human/var/list/bodyparts_by_name = list() // map organ names to organs
// Takes care of organ related updates, such as broken and missing limbs
/mob/living/carbon/human/proc/handle_organs()
@@ -18,7 +18,7 @@
last_dam = damage_this_tick
if(force_process)
bad_external_organs.Cut()
- for(var/obj/item/organ/external/Ex in organs)
+ for(var/obj/item/organ/external/Ex in bodyparts)
bad_external_organs |= Ex
//processing internal organs is pretty cheap, do that first.
@@ -69,7 +69,7 @@
return
for(var/limb_tag in list("l_leg","r_leg","l_foot","r_foot"))
- var/obj/item/organ/external/E = organs_by_name[limb_tag]
+ var/obj/item/organ/external/E = bodyparts_by_name[limb_tag]
if(!E || (E.status & (ORGAN_DESTROYED|ORGAN_DEAD)) || E.is_malfunctioning())
stance_damage += 2 // let it fail even if just foot&leg. Also malfunctioning happens sporadically so it should impact more when it procs
else if(E.is_broken() || !E.is_usable())
@@ -100,7 +100,7 @@
if(!l_hand && !r_hand)
return
- for(var/obj/item/organ/external/E in organs)
+ for(var/obj/item/organ/external/E in bodyparts)
if(!E || !E.can_grasp || (E.status & ORGAN_SPLINTED))
continue
@@ -175,7 +175,7 @@
/mob/living/carbon/human/proc/handle_trace_chems()
//New are added for reagents to random organs.
for(var/datum/reagent/A in reagents.reagent_list)
- var/obj/item/organ/internal/O = pick(organs)
+ var/obj/item/organ/internal/O = pick(bodyparts)
O.trace_chemicals[A.name] = 100
/*
@@ -186,7 +186,7 @@ old_ue: Set this to a UE string, and this proc will overwrite the dna of organs
*/
/mob/living/carbon/human/proc/sync_organ_dna(var/assimilate = 1, var/old_ue = null)
var/ue_to_compare = (old_ue) ? old_ue : dna.unique_enzymes
- var/list/all_bits = internal_organs|organs
+ var/list/all_bits = internal_organs|bodyparts
for(var/obj/item/organ/O in all_bits)
if(assimilate || O.dna.unique_enzymes == ue_to_compare)
O.set_dna(dna)
@@ -204,9 +204,8 @@ I use this to standardize shadowling dethrall code
/mob/living/carbon/human/has_organic_damage()
var/odmg = 0
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(O.status & ORGAN_ROBOT)
odmg += O.brute_dam
odmg += O.burn_dam
return (health < (100 - odmg))
-
diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm
index de0a0b77e3f..a208752af24 100644
--- a/code/modules/mob/living/carbon/human/interactive/interactive.dm
+++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm
@@ -268,20 +268,20 @@
zone_sel.selecting = "chest"
//arms
if(prob((SNPC_FUZZY_CHANCE_LOW+SNPC_FUZZY_CHANCE_HIGH)/4))
- var/obj/item/organ/external/R = organs_by_name["r_arm"]
+ var/obj/item/organ/external/R = bodyparts_by_name["r_arm"]
if(R)
R.robotize()
else
- var/obj/item/organ/external/L = organs_by_name["l_arm"]
+ var/obj/item/organ/external/L = bodyparts_by_name["l_arm"]
if(L)
L.robotize()
//legs
if(prob((SNPC_FUZZY_CHANCE_LOW+SNPC_FUZZY_CHANCE_HIGH)/4))
- var/obj/item/organ/external/R = organs_by_name["r_leg"]
+ var/obj/item/organ/external/R = bodyparts_by_name["r_leg"]
if(R)
R.robotize()
else
- var/obj/item/organ/external/L = organs_by_name["l_leg"]
+ var/obj/item/organ/external/L = bodyparts_by_name["l_leg"]
if(L)
L.robotize()
UpdateDamageIcon()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 93887e8542f..bb297513ef5 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -23,7 +23,7 @@
/mob/living/carbon/human/proc/has_organ(name)
- var/obj/item/organ/external/O = organs_by_name[name]
+ var/obj/item/organ/external/O = bodyparts_by_name[name]
return (O && !(O.status & ORGAN_DESTROYED) && !O.is_stump())
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index c7018183da3..be265669b79 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -255,8 +255,8 @@
emote("gasp")
updatehealth()
- if(damage && organs.len)
- var/obj/item/organ/external/O = pick(organs)
+ if(damage && bodyparts.len)
+ var/obj/item/organ/external/O = pick(bodyparts)
if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage)
/mob/living/carbon/human/breathe()
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index ae236b1ebd4..2041ca5f3e6 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -84,9 +84,12 @@
if("Captain", "Blueshield")
suit=/obj/item/clothing/suit/space/eva/plasmaman/security/captain
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/captain
- if("Head of Personnel", "Nanotrasen Representative")
+ if("Head of Personnel")
suit=/obj/item/clothing/suit/space/eva/plasmaman/security/hop
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/hop
+ if("Nanotrasen Representative")
+ suit = /obj/item/clothing/suit/space/eva/plasmaman/nt_rep
+ helm = /obj/item/clothing/head/helmet/space/eva/plasmaman/nt_rep
if("Medical Doctor","Brig Physician")
suit=/obj/item/clothing/suit/space/eva/plasmaman/medical
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/medical
diff --git a/code/modules/mob/living/carbon/human/species/skeleton.dm b/code/modules/mob/living/carbon/human/species/skeleton.dm
index d09c8dd1699..62676144ebd 100644
--- a/code/modules/mob/living/carbon/human/species/skeleton.dm
+++ b/code/modules/mob/living/carbon/human/species/skeleton.dm
@@ -48,7 +48,7 @@
if(R.id == "milk")
H.heal_overall_damage(4,4)
if(prob(5)) // 5% chance per proc to find a random limb, and mend it
- var/list/our_organs = H.organs.Copy()
+ var/list/our_organs = H.bodyparts.Copy()
shuffle(our_organs)
for(var/obj/item/organ/external/L in our_organs)
if(istype(L))
@@ -61,4 +61,4 @@
H.say(pick("Thanks Mr Skeltal", "Thank for strong bones", "Doot doot!"))
return 1
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 54550a0f560..d2d44757705 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -184,20 +184,12 @@
/datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
- for(var/obj/item/organ/internal/iorgan in H.internal_organs)
- if(iorgan in H.internal_organs)
- qdel(iorgan)
+ QDEL_LIST(H.internal_organs)
+ QDEL_LIST(H.bodyparts)
- for(var/obj/item/organ/organ in H.contents)
- if(organ in H.organs)
- qdel(organ)
-
- if(H.organs) H.organs.Cut()
- if(H.organs_by_name) H.organs_by_name.Cut()
-
- H.organs = list()
- H.internal_organs = list()
- H.organs_by_name = list()
+ LAZYREINITLIST(H.bodyparts)
+ LAZYREINITLIST(H.bodyparts_by_name)
+ LAZYREINITLIST(H.internal_organs)
for(var/limb_type in has_limbs)
var/list/organ_data = has_limbs[limb_type]
@@ -210,10 +202,10 @@
// organ new code calls `insert` on its own
new organ(H)
- for(var/name in H.organs_by_name)
- H.organs |= H.organs_by_name[name]
+ for(var/name in H.bodyparts_by_name)
+ H.bodyparts |= H.bodyparts_by_name[name]
- for(var/obj/item/organ/external/O in H.organs)
+ for(var/obj/item/organ/external/O in H.bodyparts)
O.owner = H
/datum/species/proc/handle_breath(var/datum/gas_mixture/breath, var/mob/living/carbon/human/H)
@@ -551,7 +543,7 @@
var/list/cached_overlays = H.healthdoll.cached_healthdoll_overlays
// Use the dead health doll as the base, since we have proper "healthy" overlays now
H.healthdoll.icon_state = "healthdoll_DEAD"
- for(var/obj/item/organ/external/O in H.organs)
+ for(var/obj/item/organ/external/O in H.bodyparts)
var/damage = O.burn_dam + O.brute_dam
var/comparison = (O.max_damage/5)
var/icon_num = 0
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 4e33c7cdef8..ff7d2fa22d6 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -580,8 +580,8 @@
H.g_skin = new_color_list[2]
H.b_skin = new_color_list[3]
if(world.time % SLIMEPERSON_ICON_UPDATE_PERIOD > SLIMEPERSON_ICON_UPDATE_PERIOD - 20) // The 20 is because this gets called every 2 seconds, from the mob controller
- for(var/organname in H.organs_by_name)
- var/obj/item/organ/external/E = H.organs_by_name[organname]
+ for(var/organname in H.bodyparts_by_name)
+ var/obj/item/organ/external/E = H.bodyparts_by_name[organname]
if(istype(E) && E.dna.species == "Slime People")
E.sync_colour_to_human(H)
H.update_hair(0)
@@ -634,13 +634,13 @@
return
var/list/missing_limbs = list()
- for(var/l in organs_by_name)
- var/obj/item/organ/external/E = organs_by_name[l]
+ for(var/l in bodyparts_by_name)
+ var/obj/item/organ/external/E = bodyparts_by_name[l]
if(!istype(E) || istype(E, /obj/item/organ/external/stump))
var/list/limblist = species.has_limbs[l]
var/obj/item/organ/external/limb = limblist["path"]
var/parent_organ = initial(limb.parent_organ)
- var/obj/item/organ/external/parentLimb = organs_by_name[parent_organ]
+ var/obj/item/organ/external/parentLimb = bodyparts_by_name[parent_organ]
if(!istype(parentLimb) || parentLimb.is_stump())
continue
missing_limbs[initial(limb.name)] = l
@@ -662,7 +662,7 @@
to_chat(src, "You're too hungry to regenerate a limb!")
return
- var/obj/item/organ/external/O = organs_by_name[chosen_limb]
+ var/obj/item/organ/external/O = bodyparts_by_name[chosen_limb]
var/stored_brute = 0
var/stored_burn = 0
@@ -680,7 +680,7 @@
var/limb_list = species.has_limbs[chosen_limb]
var/obj/item/organ/external/limb_path = limb_list["path"]
// Parent check
- var/obj/item/organ/external/potential_parent = organs_by_name[initial(limb_path.parent_organ)]
+ var/obj/item/organ/external/potential_parent = bodyparts_by_name[initial(limb_path.parent_organ)]
if(!istype(potential_parent) || potential_parent.is_stump())
to_chat(src, "You've lost the organ that you've been growing your new part on!")
return // No rayman for you
@@ -899,7 +899,7 @@
oxy_mod = 0
death_message = "gives one shrill beep before falling limp, their monitor flashing blue before completely shutting off..."
- flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA | RADIMMUNE | ALL_RPARTS| NOTRANSSTING
+ flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA | RADIMMUNE | ALL_RPARTS | NOTRANSSTING
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_COLOR | HAS_HEAD_MARKINGS | HAS_HEAD_ACCESSORY
dietflags = 0 //IPCs can't eat, so no diet
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 4c0088e0157..1cb97bb3e19 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -171,7 +171,7 @@ var/global/list/damage_icon_parts = list()
// first check whether something actually changed about damage appearance
var/damage_appearance = ""
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(O.is_stump())
continue
if(O.status & ORGAN_DESTROYED) damage_appearance += "d"
@@ -189,7 +189,7 @@ var/global/list/damage_icon_parts = list()
var/image/standing_image = new /image("icon" = standing)
// blend the individual damage states with our icons
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(O.is_stump())
continue
if(!(O.status & ORGAN_DESTROYED))
@@ -240,7 +240,7 @@ var/global/list/damage_icon_parts = list()
icon_key += "#000000"
for(var/organ_tag in species.has_limbs)
- var/obj/item/organ/external/part = organs_by_name[organ_tag]
+ var/obj/item/organ/external/part = bodyparts_by_name[organ_tag]
if(isnull(part) || part.is_stump() || (part.status & ORGAN_DESTROYED))
icon_key += "0"
else if(part.status & ORGAN_ROBOT)
@@ -269,7 +269,7 @@ var/global/list/damage_icon_parts = list()
var/obj/item/organ/external/chest = get_organ("chest")
base_icon = chest.get_icon(skeleton)
- for(var/obj/item/organ/external/part in organs)
+ for(var/obj/item/organ/external/part in bodyparts)
var/icon/temp = part.get_icon(skeleton)
//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)
@@ -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()
@@ -1333,7 +1332,7 @@ var/global/list/damage_icon_parts = list()
if(update_icons) update_icons()
/mob/living/carbon/human/proc/force_update_limbs()
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
O.sync_colour_to_human(src)
update_body(0)
diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm
index 0a86f2756cf..b86f88c4ff4 100644
--- a/code/modules/mob/living/carbon/shock.dm
+++ b/code/modules/mob/living/carbon/shock.dm
@@ -20,7 +20,7 @@
// broken or ripped off organs will add quite a bit of pain
if(istype(src,/mob/living/carbon/human))
var/mob/living/carbon/human/M = src
- for(var/obj/item/organ/external/organ in M.organs)
+ for(var/obj/item/organ/external/organ in M.bodyparts)
if(!organ)
continue
else if(organ.status & ORGAN_BROKEN || organ.open)
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index ce9fe15ae6e..e5a9d73e402 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -97,7 +97,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), slot_head)
var/obj/item/weapon/implant/freedom/L = new/obj/item/weapon/implant/freedom(H)
- L.implant(H, H)
+ L.implant(H)
/datum/superheroes/lightnian
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index 6943105132b..d399db99515 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -230,7 +230,7 @@
to_chat(user, "External prosthetics:")
var/organ_found
if(H.internal_organs.len)
- for(var/obj/item/organ/external/E in H.organs)
+ for(var/obj/item/organ/external/E in H.bodyparts)
if(!(E.status & ORGAN_ROBOT))
continue
organ_found = 1
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 2b0ded32896..8ab82e7d9ca 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -41,6 +41,7 @@ var/list/robot_verbs_default = list(
// Components are basically robot organs.
var/list/components = list()
+ var/obj/item/robot_parts/robot_suit/robot_suit = null //Used for deconstruction to remember what the borg was constructed out of..
var/obj/item/device/mmi/mmi = null
var/obj/item/device/pda/silicon/robot/rbPDA = null
@@ -255,6 +256,7 @@ var/list/robot_verbs_default = list(
QDEL_NULL(module)
QDEL_NULL(camera)
QDEL_NULL(cell)
+ QDEL_NULL(robot_suit)
return ..()
/mob/living/silicon/robot/proc/pick_module()
@@ -644,20 +646,13 @@ var/list/robot_verbs_default = list(
else if(wiresexposed && wires.IsAllCut())
//Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob.
if(!mmi)
- to_chat(user, "\The [src] has no brain to remove.")
+ to_chat(user, "[src] has no brain to remove.")
return
- to_chat(user, "You jam the crowbar into the robot and begin levering [mmi].")
+ to_chat(user, "You jam the crowbar into the robot and begin levering the securing bolts.")
if(do_after(user, 30 * W.toolspeed, target = src))
- to_chat(user, "You damage some parts of the chassis, but eventually manage to rip out [mmi]!")
- var/obj/item/robot_parts/robot_suit/C = new/obj/item/robot_parts/robot_suit(loc)
- C.l_leg = new/obj/item/robot_parts/l_leg(C)
- C.r_leg = new/obj/item/robot_parts/r_leg(C)
- C.l_arm = new/obj/item/robot_parts/l_arm(C)
- C.r_arm = new/obj/item/robot_parts/r_arm(C)
- C.updateicon()
- new/obj/item/robot_parts/chest(loc)
- qdel(src)
+ user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!")
+ deconstruct()
else
// Okay we're not removing the cell or an MMI, but maybe something else?
var/list/removable_components = list()
@@ -1135,6 +1130,49 @@ var/list/robot_verbs_default = list(
update_icons()
+/mob/living/silicon/robot/proc/deconstruct()
+ var/turf/T = get_turf(src)
+ if(robot_suit)
+ robot_suit.forceMove(T)
+ robot_suit.l_leg.forceMove(T)
+ robot_suit.l_leg = null
+ robot_suit.r_leg.forceMove(T)
+ robot_suit.r_leg = null
+ new /obj/item/stack/cable_coil(T, robot_suit.chest.wired)
+ robot_suit.chest.forceMove(T)
+ robot_suit.chest.wired = FALSE
+ robot_suit.chest = null
+ robot_suit.l_arm.forceMove(T)
+ robot_suit.l_arm = null
+ robot_suit.r_arm.forceMove(T)
+ robot_suit.r_arm = null
+ robot_suit.head.forceMove(T)
+ robot_suit.head.flash1.forceMove(T)
+ robot_suit.head.flash1.burn_out()
+ robot_suit.head.flash1 = null
+ robot_suit.head.flash2.forceMove(T)
+ robot_suit.head.flash2.burn_out()
+ robot_suit.head.flash2 = null
+ robot_suit.head = null
+ robot_suit.updateicon()
+ else
+ new /obj/item/robot_parts/robot_suit(T)
+ new /obj/item/robot_parts/l_leg(T)
+ new /obj/item/robot_parts/r_leg(T)
+ new /obj/item/stack/cable_coil(T, 1)
+ new /obj/item/robot_parts/chest(T)
+ new /obj/item/robot_parts/l_arm(T)
+ new /obj/item/robot_parts/r_arm(T)
+ new /obj/item/robot_parts/head(T)
+ var/b
+ for(b=0, b!=2, b++)
+ var/obj/item/device/flash/F = new /obj/item/device/flash(T)
+ F.burn_out()
+ if(cell) //Sanity check.
+ cell.forceMove(T)
+ cell = null
+ qdel(src)
+
#define BORG_CAMERA_BUFFER 30
/mob/living/silicon/robot/Move(a, b, flag)
var/oldLoc = src.loc
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/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 904762d6c27..ffd354961ef 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -58,15 +58,12 @@
/mob/living/simple_animal/hostile/poison/bees/Destroy()
beegent = null
+ if(beehome)
+ if(beehome.bees)
+ beehome.bees.Remove(src)
+ beehome = null
return ..()
-/mob/living/simple_animal/hostile/poison/bees/death(gibbed)
- beegent = null
- ..()
-
-/mob/living/simple_animal/hostile/poison/bees/examine(mob/user)
- ..()
-
/mob/living/simple_animal/hostile/poison/bees/proc/generate_bee_visuals()
overlays.Cut()
@@ -137,21 +134,6 @@
/mob/living/simple_animal/hostile/poison/bees/worker
//Blank type define in case we need to give them special stuff later, plus organization (currently they are same as base type bee)
-
-/mob/living/simple_animal/hostile/poison/bees/worker/Destroy()
- if(beehome)
- if(beehome.bees)
- beehome.bees.Remove(src)
- beehome = null
- return ..()
-
-/mob/living/simple_animal/hostile/poison/bees/worker/death(gibbed)
- if(beehome)
- if(beehome.bees)
- beehome.bees.Remove(src)
- beehome = null
- ..()
-
/mob/living/simple_animal/hostile/poison/bees/worker/examine(mob/user)
..()
@@ -313,6 +295,10 @@
beegent = new /datum/reagent/facid() //prepare to die
var/list/master_and_friends = list()
+/mob/living/simple_animal/hostile/poison/bees/syndi/Destroy()
+ master_and_friends.Cut()
+ return ..()
+
/mob/living/simple_animal/hostile/poison/bees/syndi/assign_reagent(datum/reagent/R)
return
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 1df7348a839..911f66a5527 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -30,7 +30,7 @@
var/attack_same = 0 //Set us to 1 to allow us to attack our own faction, or 2, to only ever attack our own faction
var/AIStatus = AI_ON //The Status of our AI, can be set to AI_ON (On, usual processing), AI_IDLE (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever)
-
+
//typecache of things this mob will attack in DestroySurroundings() if it has environment_smash
var/list/environment_target_typecache = list(
/obj/machinery/door/window,
@@ -44,15 +44,16 @@
var/atom/targets_from = null //all range/attack/etc. calculations should be done from this atom, defaults to the mob itself, useful for Vehicles and such
var/list/emote_taunt = list()
var/taunt_chance = 0
-
+
/mob/living/simple_animal/hostile/New()
..()
if(!targets_from)
targets_from = src
environment_target_typecache = typecacheof(environment_target_typecache)
-
+
/mob/living/simple_animal/hostile/Destroy()
targets_from = null
+ target = null
return ..()
/mob/living/simple_animal/hostile/Life()
@@ -80,7 +81,7 @@
if(AIShouldSleep(possible_targets)) // we try to acquire a new one
AIStatus = AI_IDLE // otherwise we go idle
return 1
-
+
/mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user)
if(stat == CONSCIOUS && !target && AIStatus != AI_OFF && !client && user)
FindTarget(list(user), 1)
@@ -91,8 +92,8 @@
if(P.firer && get_dist(src, P.firer) <= aggro_vision_range)
FindTarget(list(P.firer), 1)
Goto(P.starting, move_to_delay, 3)
- return ..()
-
+ return ..()
+
//////////////HOSTILE MOB TARGETTING AND AGGRESSION////////////
@@ -126,7 +127,7 @@
var/Target = PickTarget(.)
GiveTarget(Target)
return Target //We now have a target
-
+
/mob/living/simple_animal/hostile/proc/PossibleThreats()
. = list()
for(var/pos_targ in ListTargets())
@@ -176,24 +177,24 @@
if(faction_check && !attack_same)
return 0
return 1
-
+
if(ishuman(the_target))
var/mob/living/carbon/human/H = the_target
if(is_type_in_list(src, H.species.ignored_by))
return 0
-
+
if(istype(the_target, /obj/mecha))
var/obj/mecha/M = the_target
if(M.occupant)//Just so we don't attack empty mechs
if(CanAttack(M.occupant))
return 1
-
+
if(istype(the_target, /obj/spacepod))
var/obj/spacepod/S = the_target
if(S.pilot) //Just so we don't attack empty pods
if(CanAttack(S.pilot))
return 1
-
+
if(istype(the_target, /obj/machinery/porta_turret))
var/obj/machinery/porta_turret/P = the_target
if(P.faction in faction)
@@ -292,7 +293,7 @@
/mob/living/simple_animal/hostile/death(gibbed)
LoseTarget()
..(gibbed)
-
+
/mob/living/simple_animal/hostile/proc/summon_backup(distance)
do_alert_animation(src)
playsound(loc, 'sound/machines/chime.ogg', 50, 1, -1)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 40835475e2c..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
@@ -870,8 +868,8 @@ var/list/slot_equipment_priority = list( \
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.health <= config.health_threshold_softcrit)
- for(var/name in H.organs_by_name)
- var/obj/item/organ/external/e = H.organs_by_name[name]
+ for(var/name in H.bodyparts_by_name)
+ var/obj/item/organ/external/e = H.bodyparts_by_name[name]
if(e && H.lying)
if(((e.status & ORGAN_BROKEN && !(e.status & ORGAN_SPLINTED)) || e.status & ORGAN_BLEEDING) && (H.getBruteLoss() + H.getFireLoss() >= 100))
return 1
@@ -1117,7 +1115,7 @@ var/list/slot_equipment_priority = list( \
var/mob/living/carbon/human/H = src
var/obj/item/organ/external/affected
- for(var/obj/item/organ/external/organ in H.organs) //Grab the organ holding the implant.
+ for(var/obj/item/organ/external/organ in H.bodyparts) //Grab the organ holding the implant.
for(var/obj/item/weapon/O in organ.implants)
if(O == selection)
affected = organ
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index e52854621bd..624ec318f03 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -352,7 +352,7 @@
(affected.glasses && affected.glasses.flags_cover & GLASSESCOVERSEYES))
to_chat(assailant, "You're going to need to remove the eye covering first.")
return
- if(!affected.internal_organs_by_name["eyes"])
+ if(!affected.internal_bodyparts_by_name["eyes"])
to_chat(assailant, "You cannot locate any eyes on [affecting]!")
return
assailant.visible_message("[assailant] presses \his fingers into [affecting]'s eyes!")
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 69bba669de0..6c443b4aa30 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -17,7 +17,7 @@
/mob/living/carbon/human/isSynthetic()
// If they are 100% robotic, they count as synthetic.
- for(var/obj/item/organ/external/E in organs)
+ for(var/obj/item/organ/external/E in bodyparts)
if(!(E.status & ORGAN_ROBOT))
return 0
return 1
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index e8899ef6123..9a2ea2e3499 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -658,6 +658,20 @@
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CORONER)
+ clothes_s = new /icon(uniform_dmi, "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "mortician"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(GENETICIST)
clothes_s = new /icon(uniform_dmi, "geneticswhite_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
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/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index f7fb545d495..c21733a7a39 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -55,7 +55,7 @@
canmove = 0
icon = null
invisibility = 101
- for(var/t in organs)
+ for(var/t in bodyparts)
qdel(t)
for(var/i in internal_organs)
qdel(i)
@@ -115,7 +115,7 @@
canmove = 0
icon = null
invisibility = 101
- for(var/t in organs)
+ for(var/t in bodyparts)
qdel(t)
var/alien_caste = pick("Hunter","Sentinel","Drone")
@@ -147,7 +147,7 @@
canmove = 0
icon = null
invisibility = 101
- for(var/t in organs)
+ for(var/t in bodyparts)
qdel(t)
var/mob/living/carbon/slime/new_slime
@@ -183,7 +183,7 @@
canmove = 0
icon = null
invisibility = 101
- for(var/t in organs) //this really should not be necessary
+ for(var/t in bodyparts) //this really should not be necessary
qdel(t)
var/mob/living/simple_animal/pet/corgi/new_corgi = new /mob/living/simple_animal/pet/corgi (loc)
@@ -212,7 +212,7 @@
icon = null
invisibility = 101
- for(var/t in organs)
+ for(var/t in bodyparts)
qdel(t)
var/mob/new_mob = new mobpath(src.loc)
@@ -252,7 +252,7 @@
canmove = 0
icon = null
invisibility = 101
- for(var/t in organs) //this really should not be necessary
+ for(var/t in bodyparts) //this really should not be necessary
qdel(t)
var/obj/item/device/paicard/card = new(loc)
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 9770fb8c523..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()
@@ -54,9 +51,9 @@
/obj/item/weapon/paper_bin/attack_hand(mob/user as mob)
if(ishuman(user))
var/mob/living/carbon/human/H = user
- var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
+ var/obj/item/organ/external/temp = H.bodyparts_by_name["r_hand"]
if(H.hand)
- temp = H.organs_by_name["l_hand"]
+ temp = H.bodyparts_by_name["l_hand"]
if(temp && !temp.is_usable())
to_chat(H, "You try to move your [temp.name], but cannot!")
return
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/cable.dm b/code/modules/power/cable.dm
index 775c53fee72..33aa4931fcc 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -521,7 +521,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
/obj/item/stack/cable_coil/attack(mob/M, mob/user)
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting]
+ var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_sel.selecting]
if(!S)
return
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/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index c155cfb9dff..456627398ce 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -70,3 +70,16 @@
/obj/item/weapon/gun/energy/pulse/pistol/m1911/isHandgun()
return 1
+
+/obj/item/weapon/gun/energy/pulse/turret
+ name = "pulse turret gun"
+ desc = "A heavy, turret-mounted pulse energy cannon."
+ icon_state = "turretlaser"
+ item_state = "turretlaser"
+ slot_flags = null
+ w_class = 5
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/pulse)
+ weapon_weight = WEAPON_MEDIUM
+ can_flashlight = 0
+ trigger_guard = TRIGGER_GUARD_NONE
+ ammo_x_offset = 2
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index 032874c4918..a556d4572a2 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -103,7 +103,7 @@
target.adjustFireLoss(-4)
if(ishuman(target))
var/var/mob/living/carbon/human/H = target
- for(var/obj/item/organ/external/E in H.organs)
+ for(var/obj/item/organ/external/E in H.bodyparts)
if(prob(10))
if(E.mend_fracture())
E.perma_injury = 0
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/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 5c8d5136324..7434038eb91 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -145,6 +145,8 @@
name = "rubber pellet"
damage = 3
stamina = 25
+ embed = 0
+ sharp = 0
icon_state = "bullet-r"
/obj/item/projectile/bullet/stunshot//taser slugs for shotguns, nothing special
@@ -201,11 +203,14 @@
stun = 4
/obj/item/projectile/bullet/honker
+ name = "banana"
damage = 0
weaken = 5
stun = 5
forcedodge = 1
nodamage = 1
+ embed = 0
+ sharp = 0
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
hitsound = 'sound/items/bikehorn.ogg'
icon = 'icons/obj/hydroponics/harvest.dmi'
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index b0d2a53c0d9..6d4976e1d53 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -162,7 +162,7 @@ proc/wabbajack(mob/living/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
// Make sure there are no organs or limbs to drop
- for(var/t in H.organs)
+ for(var/t in H.bodyparts)
qdel(t)
for(var/i in H.internal_organs)
qdel(i)
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/chemistry/reagents/admin.dm b/code/modules/reagents/chemistry/reagents/admin.dm
index a915ef8cd57..b94998221ef 100644
--- a/code/modules/reagents/chemistry/reagents/admin.dm
+++ b/code/modules/reagents/chemistry/reagents/admin.dm
@@ -21,7 +21,7 @@
for(var/name in H.internal_organs)
var/obj/item/organ/internal/I = H.get_int_organ(name)
I.damage = max(0, I.damage-5)
- for(var/obj/item/organ/external/E in H.organs)
+ for(var/obj/item/organ/external/E in H.bodyparts)
if(E.mend_fracture())
E.perma_injury = 0
M.SetEyeBlind(0)
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index b07e9da9124..9b651a21443 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -819,10 +819,11 @@
drink_desc = "A drink that is guaranteed to knock you silly."
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/M)
- M.Weaken(3)
- if(current_cycle >=55)
+ if(current_cycle >= 13)
+ M.Weaken(3)
+ if(current_cycle >= 55)
M.Druggy(55)
- if(current_cycle >=200)
+ if(current_cycle >= 200)
M.adjustToxLoss(2)
..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index f3c1cf2e96c..a8fcf888318 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -652,7 +652,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/necrosis_prob = 40 * min((20 MINUTES), max((time_dead - (1 MINUTES)), 0)) / ((20 MINUTES) - (1 MINUTES))
- for(var/obj/item/organ/O in (H.organs | H.internal_organs))
+ for(var/obj/item/organ/O in (H.bodyparts | H.internal_organs))
// Per non-vital body part:
// 0% chance of necrosis within 1 minute of death
// 40% chance of necrosis after 20 minutes of death
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/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 876a4352fe9..b31eeb43319 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -883,7 +883,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_laser
- name = "Exosuit Weapon (CH-PS \"Immolator\" Laser)"
+ name = "Exosuit Weapon (CH-PL \"Firedart\" Laser)"
desc = "Allows for the construction of CH-PS Laser."
id = "mech_laser"
build_type = MECHFAB
@@ -893,6 +893,17 @@
construction_time = 100
category = list("Exosuit Equipment")
+/datum/design/mech_disabler
+ name = "Exosuit Weapon (CH-PD Disabler)"
+ desc = "Allows for the construction of CH-PD Disabler."
+ id = "mech_laser"
+ build_type = MECHFAB
+ req_tech = list("combat" = 3, "magnets" = 3)
+ build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/disabler
+ materials = list(MAT_METAL=10000)
+ construction_time = 100
+ category = list("Exosuit Equipment")
+
/datum/design/mech_carbine
name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)"
desc = "Allows for the construction of FNX-99 \"Hades\" Carbine."
@@ -959,6 +970,28 @@
construction_time = 100
category = list("Exosuit Equipment")
+/datum/design/mech_tesla
+ name = "Exosuit Weapon (P-X Tesla Cannon)"
+ desc = "Allows for the construction of P-X Tesla Cannon."
+ id = "mech_tesla"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5)
+ build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla
+ materials = list(MAT_METAL = 10000, MAT_GLASS = 10000, MAT_SILVER = 10000)
+ construction_time = 100
+ category = list("Exosuit Equipment")
+
+/datum/design/mech_immolator
+ name = "Exosuit Weapon (ZFI Immolation Beam Gun)"
+ desc = "Allows for the construction of ZFI Immolation Beam Gun."
+ id = "mech_tesla"
+ build_type = MECHFAB
+ req_tech = list("combat" = 4, "materials" = 4, "plasmatech" = 2, "magnets" = 3)
+ build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator
+ materials = list(MAT_METAL = 4000, MAT_GLASS = 1000, MAT_SILVER = 3000, MAT_PLASMA = 2000)
+ construction_time = 100
+ category = list("Exosuit Equipment")
+
//Cyborg Upgrade Modules
/datum/design/borg_upgrade_reset
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
index 3f823315078..b1071222b17 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
@@ -13,7 +13,7 @@
if(ishuman(toucher))
var/mob/living/carbon/human/H = toucher
- for(var/obj/item/organ/external/affecting in H.organs)
+ for(var/obj/item/organ/external/affecting in H.bodyparts)
if(affecting && istype(affecting))
affecting.heal_damage(25 * weakness, 25 * weakness)
//H:heal_organ_damage(25, 25)
diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm
index 0d25330177c..42bfb39b4eb 100644
--- a/code/modules/security_levels/security levels.dm
+++ b/code/modules/security_levels/security levels.dm
@@ -34,9 +34,9 @@
post_status("alert", "outline")
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(is_station_contact(FA.z))
- FA.overlays = list()
+ FA.overlays.Cut()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_green")
if(SEC_LEVEL_BLUE)
@@ -48,9 +48,9 @@
post_status("alert", "outline")
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(is_station_contact(FA.z))
- FA.overlays = list()
+ FA.overlays.Cut()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_blue")
if(SEC_LEVEL_RED)
@@ -60,16 +60,16 @@
security_announcement_down.Announce("The station's self-destruct mechanism has been deactivated, but there is still an immediate and serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.","Attention! Code Red!")
security_level = SEC_LEVEL_RED
- var/obj/machinery/door/airlock/highsecurity/red/R = locate(/obj/machinery/door/airlock/highsecurity/red) in world
+ var/obj/machinery/door/airlock/highsecurity/red/R = locate(/obj/machinery/door/airlock/highsecurity/red) in airlocks
if(R && is_station_level(R.z))
R.locked = 0
R.update_icon()
post_status("alert", "redalert")
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(is_station_contact(FA.z))
- FA.overlays = list()
+ FA.overlays.Cut()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_red")
if(SEC_LEVEL_GAMMA)
@@ -91,9 +91,9 @@
post_status("alert", "gammaalert")
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(is_station_contact(FA.z))
- FA.overlays = list()
+ FA.overlays.Cut()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_gamma")
FA.update_icon()
@@ -103,9 +103,9 @@
post_status("alert", "epsilonalert")
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(is_station_contact(FA.z))
- FA.overlays = list()
+ FA.overlays.Cut()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_epsilon")
if(SEC_LEVEL_DELTA)
@@ -114,9 +114,9 @@
post_status("alert", "deltaalert")
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(is_station_contact(FA.z))
- FA.overlays = list()
+ FA.overlays.Cut()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_delta")
else
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 5f01cf8e890..5903035903b 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -203,6 +203,17 @@
return
var/time_left = timeLeft(1)
+
+ // The emergency shuttle doesn't work like others so this
+ // ripple check is slightly different
+ if(!ripples.len && (time_left <= SHUTTLE_RIPPLE_TIME) && ((mode == SHUTTLE_CALL) || (mode == SHUTTLE_ESCAPE)))
+ var/destination
+ if(mode == SHUTTLE_CALL)
+ destination = shuttle_master.getDock("emergency_home")
+ else if(mode == SHUTTLE_ESCAPE)
+ destination = shuttle_master.getDock("emergency_away")
+ create_ripples(destination)
+
switch(mode)
if(SHUTTLE_RECALL)
if(time_left <= 0)
@@ -251,6 +262,10 @@
mode = SHUTTLE_ESCAPE
timer = world.time
priority_announcement.Announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.")
+ for(var/mob/M in player_list)
+ if(!isnewplayer(M) && !M.client.karma_spent && !M.get_preference(DISABLE_KARMA_REMINDER))
+ to_chat(M, "You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under OOC tab, Award Karma.")
+
if(SHUTTLE_ESCAPE)
if(time_left <= 0)
//move each escape pod to its corresponding escape dock
diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm
new file mode 100644
index 00000000000..0c48a9c24bf
--- /dev/null
+++ b/code/modules/shuttle/ripple.dm
@@ -0,0 +1,19 @@
+/obj/effect/overlay/temp/ripple
+ name = "hyperspace ripple"
+ desc = "Something is coming through hyperspace, you can see the \
+ visual disturbances. It's probably best not to be on top of these \
+ when whatever is tunneling comes through."
+ icon = 'icons/turf/floors/ripple.dmi'
+ icon_state = "ripple"
+ anchored = TRUE
+ density = FALSE
+ smooth = SMOOTH_TRUE
+ layer = RIPPLE_LAYER
+ alpha = 0
+ duration = 3 * SHUTTLE_RIPPLE_TIME
+ mouse_opacity = 1
+
+/obj/effect/overlay/temp/ripple/New()
+ . = ..()
+ smooth_icon(src)
+ animate(src, alpha=255, time=SHUTTLE_RIPPLE_TIME)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 6f019350217..d1f41585516 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -22,6 +22,8 @@
// All shuttle templates are timid
var/timid = FALSE
+ var/list/ripples = list()
+
//these objects are indestructable
/obj/docking_port/Destroy(force)
if(force)
@@ -378,10 +380,44 @@
qdel(src, force=TRUE)
+/obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1)
+ var/list/turfs = ripple_area(S1)
+ for(var/i in turfs)
+ ripples += new /obj/effect/overlay/temp/ripple(i)
+
+/obj/docking_port/mobile/proc/remove_ripples()
+ if(ripples.len)
+ for(var/i in ripples)
+ qdel(i)
+ ripples.Cut()
+
+
+/obj/docking_port/mobile/proc/ripple_area(obj/docking_port/stationary/S1)
+ var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance)
+ var/list/L1 = return_ordered_turfs(S1.x, S1.y, S1.z, S1.dir)
+
+ var/list/ripple_turfs = list()
+
+ for(var/i in 1 to L0.len)
+ var/turf/T0 = L0[i]
+ if(!T0)
+ continue
+ var/turf/T1 = L1[i]
+ if(!T1)
+ continue
+ if(T0.type != T0.baseturf)
+ ripple_turfs += T1
+
+ return ripple_turfs
+
//this is the main proc. It instantly moves our mobile port to stationary port S1
//it handles all the generic behaviour, such as sanity checks, closing doors on the shuttle, stunning mobs, etc
/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/S1, force=FALSE)
// Crashing this ship with NO SURVIVORS
+ if(S1.get_docked() == src)
+ remove_ripples()
+ return
+
if(!force)
if(!check_dock(S1))
return -1
@@ -389,6 +425,7 @@
if(canMove())
return -1
+
// //rotate transit docking ports, so we don't need zillions of variants
// if(istype(S1, /obj/docking_port/stationary/transit))
// S1.dir = turn(NORTH, -travelDir)
@@ -423,6 +460,9 @@
for(var/turf/T0 in L0)
A0.contents += T0
+ // Removes ripples
+ remove_ripples()
+
//move or squish anything in the way ship at destination
roadkill(L0, L1, S1.dir)
@@ -564,7 +604,10 @@
//used by shuttle subsystem to check timers
/obj/docking_port/mobile/proc/check()
+ check_effects()
+
var/timeLeft = timeLeft(1)
+
if(timeLeft <= 0)
switch(mode)
if(SHUTTLE_CALL)
@@ -579,6 +622,12 @@
timer = 0
destination = null
+/obj/docking_port/mobile/proc/check_effects()
+ if(!ripples.len)
+ if((mode == SHUTTLE_CALL) || (mode == SHUTTLE_RECALL))
+ var/tl = timeLeft(1)
+ if(tl <= SHUTTLE_RIPPLE_TIME)
+ create_ripples(destination)
/obj/docking_port/mobile/proc/setTimer(wait)
if(timer <= 0)
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/implant.dm b/code/modules/surgery/implant.dm
index b952ddd0f79..498976c4635 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -291,7 +291,6 @@
user.visible_message("[user] places [I] into [case]!", "You place [I] into [case].")
else
qdel(I)
- //target.sec_hud_set_implants()
return 1
else
user.visible_message(" [user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 794bf2a3e9f..667f5c02a96 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -198,7 +198,7 @@
user.visible_message("[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool].", \
"You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].")
E.status &= ~ORGAN_DESTROYED
- var/obj/item/organ/external/stump = target.organs_by_name["limb stump"]
+ var/obj/item/organ/external/stump = target.bodyparts_by_name["limb stump"]
if(stump)
stump.remove(target)
if(E.children)
@@ -248,7 +248,7 @@
if(!organ_data)
continue
// This will break if there's more than one stump ever
- var/obj/item/organ/external/stump = target.organs_by_name["limb stump"]
+ var/obj/item/organ/external/stump = target.bodyparts_by_name["limb stump"]
if(stump)
stump.remove(target)
var/new_limb_type = organ_data["path"]
diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index d1a36f2c4a3..9eefe264524 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -118,7 +118,7 @@
//Bleeding out
var/blood_max = 0
- for(var/obj/item/organ/external/temp in organs)
+ for(var/obj/item/organ/external/temp in bodyparts)
if(!(temp.status & ORGAN_BLEEDING) || temp.status & ORGAN_ROBOT)
continue
for(var/datum/wound/W in temp.wounds)
diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm
index a61537f1985..94b0de5e066 100644
--- a/code/modules/surgery/organs/helpers.dm
+++ b/code/modules/surgery/organs/helpers.dm
@@ -43,6 +43,6 @@
return istype(A, /obj/item/organ/internal)
/mob/living/carbon/human/proc/get_limb_by_name(limb_name) //Look for a limb with the given limb name in the source mob, and return it if found.
- for(var/obj/item/organ/external/O in organs)
+ for(var/obj/item/organ/external/O in bodyparts)
if(limb_name == O.limb_name)
return O
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index dd0c9655384..1af9e92b233 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -32,6 +32,14 @@ var/list/organ_cache = list()
var/sterile = 0 //can the organ be infected by germs?
var/tough = 0 //can organ be easily damaged?
+/obj/item/organ/Destroy()
+ processing_objects.Remove(src)
+ if(owner)
+ remove(owner, 1)
+ QDEL_LIST_ASSOC_VAL(autopsy_data)
+ QDEL_NULL(dna)
+ return ..()
+
/obj/item/organ/proc/update_health()
return
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 009f2a929ec..151636a9a50 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -71,11 +71,11 @@
/obj/item/organ/external/necrotize(update_sprite=TRUE)
if(status & (ORGAN_ROBOT|ORGAN_DEAD))
return
- to_chat(owner, "You can't feel your [name] anymore...")
status |= ORGAN_DEAD
if(dead_icon)
icon_state = dead_icon
if(owner)
+ to_chat(owner, "You can't feel your [name] anymore...")
owner.update_body(update_sprite)
owner.bad_external_organs |= src
if(vital)
@@ -85,6 +85,8 @@
if(parent && parent.children)
parent.children -= src
+ parent = null
+
if(internal_organs)
for(var/obj/item/organ/internal/O in internal_organs)
internal_organs -= O
@@ -92,16 +94,20 @@
qdel(O)
if(owner)
- owner.organs_by_name[limb_name] = null
+ 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)
wound_cleanup_timer = null
+ QDEL_LIST(wounds)
+
+ QDEL_LIST(implants)
+
+ QDEL_NULL(hidden)
+
return ..()
/obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -157,15 +163,15 @@
status = status & ~ORGAN_DESTROYED
forceMove(owner)
if(istype(owner))
- if(!isnull(owner.organs_by_name[limb_name]))
+ if(!isnull(owner.bodyparts_by_name[limb_name]))
log_debug("Duplicate organ in slot \"[limb_name]\", mob '[target]'")
- owner.organs_by_name[limb_name] = src
- owner.organs |= src
+ owner.bodyparts_by_name[limb_name] = src
+ owner.bodyparts |= src
for(var/atom/movable/stuff in src)
stuff.attempt_become_organ(src, owner)
if(parent_organ)
- parent = owner.organs_by_name[src.parent_organ]
+ parent = owner.bodyparts_by_name[src.parent_organ]
if(parent)
if(!parent.children)
parent.children = list()
@@ -726,7 +732,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(status & ORGAN_ROBOT)
stump.robotize()
stump.wounds |= W
- victim.organs |= stump
+ victim.bodyparts |= stump
stump.update_damages()
parent = null
@@ -946,9 +952,9 @@ Note that amputating the affected organ does in fact remove the infection from t
thing.forceMove(src)
release_restraints(victim)
- victim.organs -= src
+ victim.bodyparts -= src
if(is_primary_organ(victim))
- victim.organs_by_name[limb_name] = null // Remove from owner's vars.
+ victim.bodyparts_by_name[limb_name] = null // Remove from owner's vars.
//Robotic limbs explode if sabotaged.
if(is_robotic && sabotaged)
@@ -984,7 +990,7 @@ Note that amputating the affected organ does in fact remove the infection from t
O = owner
if(!istype(O)) // You're not the primary organ of ANYTHING, bucko
return 0
- return src == O.organs_by_name[limb_name]
+ return src == O.bodyparts_by_name[limb_name]
// The callback we use to remove wounds from an un-processed limb
/obj/item/organ/external/proc/cleanup_wounds(var/list/slated_wounds)
diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm
index e174ed55a3f..6c2c9a89c08 100644
--- a/code/modules/surgery/organs/organ_icon.dm
+++ b/code/modules/surgery/organs/organ_icon.dm
@@ -55,7 +55,7 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/H)
..()
- var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_organs_by_name["eyes"]
+ var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_bodyparts_by_name["eyes"]
if(eyes) eyes.update_colour()
/obj/item/organ/external/head/remove()
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 4d331515606..7bea9c480af 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -15,11 +15,6 @@
if(istype(holder))
insert(holder)
-/obj/item/organ/internal/Destroy()
- if(owner)
- remove(owner, 1)
- return ..()
-
/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, var/dont_remove_slot = 0)
if(!iscarbon(M) || owner == M)
return
@@ -42,7 +37,7 @@
log_runtime(EXCEPTION("[src] attempted to insert into a [parent_organ], but [parent_organ] wasn't an organ! [atom_loc_line(M)]"), src)
else
parent.internal_organs |= src
- //M.internal_organs_by_name[src] |= src(H,1)
+ //M.internal_bodyparts_by_name[src] |= src(H,1)
loc = null
for(var/X in actions)
var/datum/action/A = X
@@ -120,12 +115,6 @@
reagents.add_reagent("nutriment", 5)
-
-/obj/item/organ/internal/Destroy()
- if(owner)
- remove(owner, 1)
- return ..()
-
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
if(M == user && ishuman(user))
var/mob/living/carbon/human/H = user
@@ -296,21 +285,18 @@
// . = ..()
-/obj/item/organ/internal/lungs/process()
+/obj/item/organ/internal/lungs/on_life()
..()
-
- if(!owner)
- return
if(germ_level > INFECTION_LEVEL_ONE)
if(prob(5))
owner.emote("cough") //respitory tract infection
if(is_bruised())
if(prob(2))
- spawn owner.custom_emote(1, "coughs up blood!")
+ owner.custom_emote(1, "coughs up blood!")
owner.drip(10)
if(prob(4))
- spawn owner.custom_emote(1, "gasps for air!")
+ owner.custom_emote(1, "gasps for air!")
owner.AdjustLoseBreath(5)
/obj/item/organ/internal/kidneys
@@ -321,13 +307,8 @@
parent_organ = "groin"
slot = "kidneys"
-/obj/item/organ/internal/kidneys/process()
-
+/obj/item/organ/internal/kidneys/on_life()
..()
-
- if(!owner)
- return
-
// Coffee is really bad for you with busted kidneys.
// This should probably be expanded in some way, but fucked if I know
// what else kidneys can process in our reagent list.
@@ -439,12 +420,8 @@
slot = "liver"
var/alcohol_intensity = 1
-/obj/item/organ/internal/liver/process()
+/obj/item/organ/internal/liver/on_life()
..()
-
- if(!owner)
- return
-
if(germ_level > INFECTION_LEVEL_ONE)
if(prob(1))
to_chat(owner, " Your skin itches.")
diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm
index 7852ac05a5b..67655e17102 100644
--- a/code/modules/surgery/organs/pain.dm
+++ b/code/modules/surgery/organs/pain.dm
@@ -92,7 +92,7 @@ mob/living/carbon/human/proc/handle_pain()
return
var/maxdam = 0
var/obj/item/organ/external/damaged_organ = null
- for(var/obj/item/organ/external/E in organs)
+ for(var/obj/item/organ/external/E in bodyparts)
if(E.status & ORGAN_DEAD|ORGAN_ROBOT) continue
var/dam = E.get_damage()
// make the choice of the organ depend on damage,
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index c7044f92fb9..951ca862317 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -89,7 +89,7 @@
/* /obj/item/organ/external/diona/removed()
var/mob/living/carbon/human/H = owner
..()
- if(!istype(H) || !H.organs || !H.organs.len)
+ if(!istype(H) || !H.bodyparts || !H.bodyparts.len)
H.death()
if(prob(50) && spawn_diona_nymph_from_organ(src))
qdel(src) */
@@ -141,7 +141,7 @@
/*/obj/item/organ/diona/removed(var/mob/living/user)
var/mob/living/carbon/human/H = owner
..()
- if(!istype(H) || !H.organs || !H.organs.len)
+ if(!istype(H) || !H.bodyparts || !H.bodyparts.len)
H.death()
if(prob(50) && spawn_diona_nymph_from_organ(src))
qdel(src) */
diff --git a/code/modules/surgery/organs/subtypes/misc.dm b/code/modules/surgery/organs/subtypes/misc.dm
deleted file mode 100644
index be76fa907dc..00000000000
--- a/code/modules/surgery/organs/subtypes/misc.dm
+++ /dev/null
@@ -1,66 +0,0 @@
-//CORTICAL BORER ORGANS.
-/obj/item/organ/internal/borer
- name = "cortical borer"
- icon = 'icons/obj/objects.dmi'
- icon_state = "borer"
- parent_organ = "head"
- organ_tag = "brain"
- slot = "borer"
- vital = 1
-
-/obj/item/organ/internal/borer/process()
-
- // Borer husks regenerate health, feel no pain, and are resistant to stuns and brainloss.
- for(var/chem in list("saline", "sailcylic", "meth", "mannitol"))
- if(owner.reagents.get_reagent_amount(chem) < 3)
- owner.reagents.add_reagent(chem, 5)
-
- // They're also super gross and ooze ichor.
- if(prob(5))
- var/mob/living/carbon/human/H = owner
- if(!istype(H))
- return
-
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in H.vessel.reagent_list
- blood_splatter(H,B,1)
- var/obj/effect/decal/cleanable/blood/splatter/goo = locate() in get_turf(owner)
- if(goo)
- goo.name = "husk ichor"
- goo.desc = "It's thick and stinks of decay."
- goo.basecolor = "#412464"
- goo.update_icon()
-
-/obj/item/organ/internal/borer/remove(var/mob/living/user)
-
- ..()
-
- var/mob/living/simple_animal/borer/B = owner.has_brain_worms()
- if(B)
- B.leave_host()
- B.ckey = owner.ckey
-
- spawn(0)
- qdel(src)
- return null
-
-//VOX ORGANS.
-/obj/item/organ/internal/stack
- name = "cortical stack"
- icon_state = "brain-prosthetic"
- parent_organ = "head"
- organ_tag = "stack"
- slot = "vox_stack"
- robotic = 2
- vital = 1
- var/backup_time = 0
- var/datum/mind/backup
-
-/obj/item/organ/internal/stack/process()
- if(owner && owner.stat != 2 && !is_broken())
- backup_time = world.time
- if(owner.mind) backup = owner.mind
-
-/obj/item/organ/internal/stack/vox
- name = "vox cortical stack"
-
-/obj/item/organ/internal/stack/vox/stack
diff --git a/code/modules/surgery/organs/subtypes/vox.dm b/code/modules/surgery/organs/subtypes/vox.dm
index f0b94e2963e..bb56c41030d 100644
--- a/code/modules/surgery/organs/subtypes/vox.dm
+++ b/code/modules/surgery/organs/subtypes/vox.dm
@@ -1,3 +1,16 @@
/obj/item/organ/internal/liver/vox
alcohol_intensity = 1.6
species = "Vox"
+
+
+/obj/item/organ/internal/stack
+ name = "cortical stack"
+ icon_state = "brain-prosthetic"
+ parent_organ = "head"
+ organ_tag = "stack"
+ slot = "vox_stack"
+ robotic = 2
+ vital = 1
+
+/obj/item/organ/internal/stack/vox
+ name = "vox cortical stack"
\ No newline at end of file
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/config/title_screens/LICENSE.txt b/config/title_screens/LICENSE.txt
new file mode 100644
index 00000000000..831689b417c
--- /dev/null
+++ b/config/title_screens/LICENSE.txt
@@ -0,0 +1,38 @@
+---LICENSE NOTICE---
+
+The server operator(s) is responsible for the copyright status of all images placed within the /config/title_screens/images folder unless otherwise noted.
+
+If an image requires attribution and/or a specific license it is up to the operator(s) to make this information publicly available on either
+a website associated with their server or on the server itself.
+
+If operators(s) allow these configuration files to be public this file can serve that purpose by keeping it properly updated.
+
+If in the future new images are published to these folders (i.e. in an online code repository) they must explicitly state their
+license if said license is not the same as the default licensing found in README.md in the root directory of the project.
+
+Do not remove this notice.
+
+---END NOTICE---
+
+
+
+
+---EXAMPLES (NOT PART OF ANY LICENSE)---
+
+These are examples of properly attrubuted and licensed images.
+They are not an actual part of any license under any circumstance.
+
+rare+foobar.png was created by Mya Quinn on Feburary 28, 2557. It is licensed under a Combative Clowning 3.0 HO-NK license (http://example.com/license/url/).
+
+Unless otherwise noted all images were created by Cuban Pete on July 26, 2555. They are licensed under the RUMBABEAT Public License.(http://example.com/license/url/).
+
+---END EXAMPLES (NOT PART OF ANY LICENSE)---
+
+
+
+
+---ADD LICENSING INFORMATION BELOW---
+
+blank.png and default.dmi use the default licensing found in README.md in the root directory of the project.
+
+
diff --git a/config/title_screens/README.txt b/config/title_screens/README.txt
new file mode 100644
index 00000000000..6e7bf166f8f
--- /dev/null
+++ b/config/title_screens/README.txt
@@ -0,0 +1,50 @@
+The enclosed images folder holds the image files used as the title screen for the game. All common formats such as PNG, JPG, and GIF are supported.
+Byond's DMI format is also supported, but if you use a DMI only include one image per file and do not give it an icon_state (the text label below the image).
+
+Keep in mind that the area a title screen fills is a 480px square so you should scale/crop source images to these dimensions first.
+The game won't scale these images for you, so smaller images will not fill the screen and larger ones will be cut off.
+
+Using unnecessarily huge images can cause client side lag and should be avoided. Extremely large GIFs should preferentially be converted to DMIs.
+Placing non-image files in the images folder can cause errors.
+
+You may add as many title screens as you like, if there is more than one a random screen is chosen (see name conventions for specifics).
+
+---
+
+Naming Conventions:
+
+Every title screen you add must have a unique name. It is allowed to name two things the same if they have different file types, but this should be discouraged.
+Avoid using the plus sign "+" and the period "." in names, as these are used internally to classify images.
+
+
+Common Titles:
+
+Common titles are in the rotation to be displayed all the time. Any name that does not include the character "+" is considered a common title.
+
+An example of a common title name is "clown".
+
+The common title screen named "default" is special. It is only used if no other titles are available. You can overwrite "default" safely, but you
+should have a title named "default" somewhere in your DMI file if you don't have any other common titles. Because default only runs in the
+absence of other titles, if you want it to also appear in the general rotation you must rename it.
+
+The common title screen named "blank.png" is also special. It is only used to fill space while the real title screen loads. You should leave this file alone.
+
+
+Map Titles:
+
+Map titles are tied to a specific in game map. To make a map title you format the name like this "(name of a map)+(name of your title)"
+
+The spelling of the map name is important. It must match exactly the define MAP_NAME found in the relevant .DM file in the /_maps folder in
+the root directory. It can also be seen in game in the status menu. Note that there are no spaces between the two names.
+
+It is absolutely fine to have more than one title tied to the same map.
+
+An example of a map title name is "Omegastation+splash".
+
+
+Rare Titles:
+
+Rare titles are a just for fun feature where they will only have a 1% chance of appear in in the title screen pool of a given round.
+Add the phrase "rare+" to the beginning of the name. Again note there are no spaces. A title cannot be rare title and a map title at the same time.
+
+An example of a rare title name is "rare+explosion"
\ No newline at end of file
diff --git a/config/title_screens/images/blank.png b/config/title_screens/images/blank.png
new file mode 100644
index 00000000000..c3167a923bf
Binary files /dev/null and b/config/title_screens/images/blank.png differ
diff --git a/icons/misc/fullscreen.dmi b/config/title_screens/images/default.dmi
similarity index 100%
rename from icons/misc/fullscreen.dmi
rename to config/title_screens/images/default.dmi
diff --git a/html/changelog.html b/html/changelog.html
index 83d4f72c771..9620ad55297 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,231 @@
-->
+
22 May 2017
+
DarkPyrolord updated:
+
+ - Rubber pellets should no longer embed.
+ - Bananas fired from the staff of the honkmother should no longer embed, or be called bullets.
+
+
Kyep updated:
+
+ - Adds mech-mounted variants of the existing tesla, immolator, and x-ray laser guns, with the same material and tech requirements. Admin-only Seraph mech also gets better weapons.
+
+
+
21 May 2017
+
KasparoVy updated:
+
+ - Fixes a bug where only the fat roundstart disability could be selected.
+
+
+
20 May 2017
+
FlattestGuitar updated:
+
+ - Adds a jobban-checking verb to the OOC tab.
+
+
KasparoVy updated:
+
+ - You can now set your character's auto-accent at character creation. The verb still exists in the OOC tab.
+
+
Kyep updated:
+
+ - Antag roles now have playtime requirements.
+
+
Kyep: updated:
+
+
Xantholne updated:
+
+ - The Coroner now has an actual job icon.
+
+
+
19 May 2017
+
IK3I updated:
+
+ - Empath stops telling you how much it hurts to not be human
+
+
MarsM0nd updated:
+
+ - NanoUI map now shows the up-to-date map.
+
+
Purpose2 updated:
+
+ - Coroner no longer alt title for MD
+ - Adds Coroner job as its own job.
+ - Adds a swanky new office for the Coroner.
+
+
+
18 May 2017
+
FreeStylaLT updated:
+
+ - Added a Newscaster to Brig Toilet.
+
+
Purpose2 updated:
+
+ - Adds a subtle chat-window reminder for karma on Shuttle departure. Disable/enable via preferences tab.
+ - Removes the ugly round-end karma popup.
+
+
TullyBurnalot updated:
+
+ - Deaf people cannot hear tape recordings anymore
+
+
+
17 May 2017
+
Fethas updated:
+
+
FlattestGuitar updated:
+
+ - You can now silence shoes just by using some duct tape on them! Shoe rags no longer exist.
+
+
Fox McCloud updated:
+
+ - Neuro-toxin bar drink weakens after 13 cycles as opposed to instantly
+
+
Purpose2 updated:
+
+ - Makes the new posters actually spawnable.
+ - Fixes far more spelling errors than there ever should have been on the posters.
+
+
Travelling Merchant updated:
+
+ - Adds a hiss emote for Unathi.
+
+
+
16 May 2017
+
FlattestGuitar updated:
+
+ - Brig lockers now have radios and prisoner IDs. As per SOP!
+
+
FreeStylaLT updated:
+
+ - Fixed broken disposals in brig.
+ - Returned missing Sergeant Araneus to HoS office.
+ - Fixed missing floor tiles in the execution hallway in Brig.
+ - Remapped the entire Brig.
+
+
Kyep updated:
+
+ - changed security officer job slots from 5 to 7.
+
+
uraniummeltdown updated:
+
+ - You can now resist out of straightjackets
+ - Straightjacketed people can be handcuffed
+
+
+
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).
+ - No longer able to put grabs inside of display cases.
+
+
+
06 May 2017
+
Allfd updated:
+
+ - Thrown mobs will not step on broken glass while being thrown.
+
+
Fethas updated:
+
+ - Fixes sacreficed your target not triggering the next objective.
+ - YOU CAN NOW ONLY CONVERT HUMANS NOT MICE!
+ - bloodspill tiles changed from base 100 (plus random number based on players) to 70.
+ - Adds Tajaran veils as a loadout options
+ - Racial loadout tab
+
+
LightFire69 updated:
+
+ - Added a pretty plasmaman suit
+
+
uraniummeltdown updated:
+
+ - Removed Robocop, Paladin, NT Default as roundstart lawsets.
+
+
+
05 May 2017
+
Fethas updated:
+
+ - Magistrate, IAA, and BS will now spawn with the correct color dpet satchal and duffel
+
+
+
01 May 2017
+
Fethas updated:
+
+ - There will now be an visual indicator to annouce that an incomming shuttle is about yo wreck you.
+
+
30 April 2017
scrubmcnoob updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 945073d6602..b929c2faae9 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4597,3 +4597,142 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
and allows the ordering of Riot shotguns.
- rscadd: Adds in a Dragonsbreathe shotgun ammo box.
- bugfix: Tranq darts now have a sprite.
+2017-05-01:
+ Fethas:
+ - rscadd: There will now be an visual indicator to annouce that an incomming shuttle
+ is about yo wreck you.
+2017-05-05:
+ Fethas:
+ - tweak: Magistrate, IAA, and BS will now spawn with the correct color dpet satchal
+ and duffel
+2017-05-06:
+ Allfd:
+ - tweak: Thrown mobs will not step on broken glass while being thrown.
+ Fethas:
+ - bugfix: Fixes sacreficed your target not triggering the next objective.
+ - bugfix: YOU CAN NOW ONLY CONVERT HUMANS NOT MICE!
+ - tweak: bloodspill tiles changed from base 100 (plus random number based on players)
+ to 70.
+ - rscadd: Adds Tajaran veils as a loadout options
+ - rscadd: Racial loadout tab
+ LightFire69:
+ - rscadd: Added a pretty plasmaman suit
+ 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
+2017-05-16:
+ FlattestGuitar:
+ - tweak: Brig lockers now have radios and prisoner IDs. As per SOP!
+ FreeStylaLT:
+ - bugfix: Fixed broken disposals in brig.
+ - bugfix: Returned missing Sergeant Araneus to HoS office.
+ - bugfix: Fixed missing floor tiles in the execution hallway in Brig.
+ - tweak: Remapped the entire Brig.
+ Kyep:
+ - tweak: changed security officer job slots from 5 to 7.
+ uraniummeltdown:
+ - tweak: You can now resist out of straightjackets
+ - tweak: Straightjacketed people can be handcuffed
+2017-05-17:
+ Fethas:
+ - rscadd: MORE GREY SPRITES!
+ FlattestGuitar:
+ - tweak: You can now silence shoes just by using some duct tape on them! Shoe rags
+ no longer exist.
+ Fox McCloud:
+ - tweak: Neuro-toxin bar drink weakens after 13 cycles as opposed to instantly
+ Purpose2:
+ - bugfix: Makes the new posters actually spawnable.
+ - bugfix: Fixes far more spelling errors than there ever should have been on the
+ posters.
+ Travelling Merchant:
+ - rscadd: Adds a hiss emote for Unathi.
+2017-05-18:
+ FreeStylaLT:
+ - rscadd: Added a Newscaster to Brig Toilet.
+ Purpose2:
+ - rscadd: Adds a subtle chat-window reminder for karma on Shuttle departure. Disable/enable
+ via preferences tab.
+ - rscdel: Removes the ugly round-end karma popup.
+ TullyBurnalot:
+ - bugfix: Deaf people cannot hear tape recordings anymore
+2017-05-19:
+ IK3I:
+ - bugfix: Empath stops telling you how much it hurts to not be human
+ MarsM0nd:
+ - bugfix: NanoUI map now shows the up-to-date map.
+ Purpose2:
+ - rscdel: Coroner no longer alt title for MD
+ - rscadd: Adds Coroner job as its own job.
+ - rscadd: Adds a swanky new office for the Coroner.
+2017-05-20:
+ FlattestGuitar:
+ - rscadd: Adds a jobban-checking verb to the OOC tab.
+ KasparoVy:
+ - rscadd: You can now set your character's auto-accent at character creation. The
+ verb still exists in the OOC tab.
+ Kyep:
+ - rscadd: Antag roles now have playtime requirements.
+ 'Kyep:':
+ - tweak: Updated CC map.
+ Xantholne:
+ - bugfix: The Coroner now has an actual job icon.
+2017-05-21:
+ KasparoVy:
+ - bugfix: Fixes a bug where only the fat roundstart disability could be selected.
+2017-05-22:
+ DarkPyrolord:
+ - bugfix: Rubber pellets should no longer embed.
+ - bugfix: Bananas fired from the staff of the honkmother should no longer embed,
+ or be called bullets.
+ Kyep:
+ - rscadd: Adds mech-mounted variants of the existing tesla, immolator, and x-ray
+ laser guns, with the same material and tech requirements. Admin-only Seraph
+ mech also gets better weapons.
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 fdf13394f20..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/hud.dmi b/icons/mob/hud.dmi
index 1de6fc4ac1d..e7deeee2ad9 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.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..111efe6de65
Binary files /dev/null and b/icons/mob/species/grey/uniform.dmi differ
diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/species/plasmaman/helmet.dmi
index f4771885c77..880e1e7c5eb 100644
Binary files a/icons/mob/species/plasmaman/helmet.dmi and b/icons/mob/species/plasmaman/helmet.dmi differ
diff --git a/icons/mob/species/plasmaman/suit.dmi b/icons/mob/species/plasmaman/suit.dmi
index 526211ef0ea..fb428adaadc 100644
Binary files a/icons/mob/species/plasmaman/suit.dmi and b/icons/mob/species/plasmaman/suit.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..d6d12749b4f 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/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 227ec28b742..0f6aa860754 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.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/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi
index 19bb100595c..f4ec02bef2b 100644
Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/suits.dmi b/icons/obj/clothing/species/plasmaman/suits.dmi
index b9695f0ff27..86027617d15 100644
Binary files a/icons/obj/clothing/species/plasmaman/suits.dmi and b/icons/obj/clothing/species/plasmaman/suits.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 9623f991e2f..cb5d510faa2 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index e9de23533ed..32d86ddf66e 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index cd8a26cea98..6f53bb25da3 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/turf/floors/ripple.dmi b/icons/turf/floors/ripple.dmi
new file mode 100644
index 00000000000..2830d2c4909
Binary files /dev/null and b/icons/turf/floors/ripple.dmi differ
diff --git a/nano/images/nanomap_z1.png b/nano/images/nanomap_z1.png
index c22e9bf6fb7..0f064d6a3db 100644
Binary files a/nano/images/nanomap_z1.png and b/nano/images/nanomap_z1.png differ
diff --git a/paradise.dme b/paradise.dme
index 143543c836a..0230f89436b 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1143,6 +1143,7 @@
#include "code\modules\client\preference\loadout\loadout_donor.dm"
#include "code\modules\client\preference\loadout\loadout_general.dm"
#include "code\modules\client\preference\loadout\loadout_hat.dm"
+#include "code\modules\client\preference\loadout\loadout_racial.dm"
#include "code\modules\client\preference\loadout\loadout_shoes.dm"
#include "code\modules\client\preference\loadout\loadout_suit.dm"
#include "code\modules\client\preference\loadout\loadout_uniform.dm"
@@ -1222,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"
@@ -1330,6 +1302,7 @@
#include "code\modules\examine\descriptions\weapons.dm"
#include "code\modules\ext_scripts\irc.dm"
#include "code\modules\ext_scripts\python.dm"
+#include "code\modules\fancytitle\fancytitle.dm"
#include "code\modules\fish\fish_eggs.dm"
#include "code\modules\fish\fish_items.dm"
#include "code\modules\fish\fish_types.dm"
@@ -2123,6 +2096,7 @@
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\emergency.dm"
#include "code\modules\shuttle\on_move.dm"
+#include "code\modules\shuttle\ripple.dm"
#include "code\modules\shuttle\shuttle.dm"
#include "code\modules\shuttle\shuttle_manipulator.dm"
#include "code\modules\shuttle\supply.dm"
@@ -2184,7 +2158,6 @@
#include "code\modules\surgery\organs\subtypes\grey.dm"
#include "code\modules\surgery\organs\subtypes\kidan.dm"
#include "code\modules\surgery\organs\subtypes\machine.dm"
-#include "code\modules\surgery\organs\subtypes\misc.dm"
#include "code\modules\surgery\organs\subtypes\nucleation.dm"
#include "code\modules\surgery\organs\subtypes\shadow.dm"
#include "code\modules\surgery\organs\subtypes\skrell.dm"
diff --git a/sound/effects/unathihiss.ogg b/sound/effects/unathihiss.ogg
new file mode 100644
index 00000000000..0ba172d4aac
Binary files /dev/null and b/sound/effects/unathihiss.ogg differ
"
- 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 += "