Skills
") out += "
| Skill | Value |
|---|
| [dpt] | " - dat += "Normal High" - if(hackState) - dat += "EXTREME" - dat += " | " - dat += "
<< Back
" + switch(screen) + if(1) //req. assistance + dat += "Which department do you need assistance from?
" + dat += "
| [dpt] | " + dat += "" + dat += "Normal" + dat += "High" + if(hackState) + dat += "EXTREME" + dat += " | " + dat += "
<< Back
" - if(2) //req. supplies - dat += "Which department do you need supplies from?
" - dat += "
| [dpt] | " - dat += "Normal High" - if(hackState) - dat += "EXTREME" - dat += " | " - dat += "
<< Back
" + if(2) //req. supplies + dat += "Which department do you need supplies from?
" + dat += "
| [dpt] | " - dat += "Normal High" - if(hackState) - dat += "EXTREME" - dat += " | " - dat += "
<< Back
" + dat += "
<< Back
" - if(6) //sent successfully - dat += "Message sent.
" - dat += "Continue
" + if(3) //relay information + dat += "Which department would you like to send information to?
" + dat += "
| [dpt] | " + dat += "" + dat += "Normal" + dat += "High" + if(hackState) + dat += "EXTREME" + dat += " | " + dat += "
<< Back
" - if(7) //unsuccessful; not sent - dat += "An error occurred.
" - dat += "Continue
" + if(6) //sent successfully + dat += "Message sent.
" + dat += "Continue
" - if(8) //view messages - for (var/obj/machinery/requests_console/Console in GLOB.allConsoles) - if (Console.department == department) - Console.newmessagepriority = NO_NEW_MESSAGE - Console.update_icon() + if(7) //unsuccessful; not sent + dat += "An error occurred.
" + dat += "Continue
" - newmessagepriority = NO_NEW_MESSAGE - update_icon() - var/messageComposite = "" - for(var/msg in messages) // This puts more recent messages at the *top*, where they belong. - messageComposite = "
[msg]
" + messageComposite
- dat += messageComposite
- dat += "<< Back to Main Menu
" + if(8) //view messages + for(var/obj/machinery/requests_console/Console in GLOB.allConsoles) + if(Console.department == department) + Console.newmessagepriority = NO_NEW_MESSAGE + Console.update_icon() - if(9) //authentication before sending - dat += "Message Authentication
" - dat += "Message for [dpt]: [message]
" - dat += "
You may authenticate your message now by scanning your ID or your stamp
" - dat += "Validated by: [msgVerified ? msgVerified : "Not Validated"]
" - dat += "Stamped by: [msgStamped ? msgStamped : "Not Stamped"]
" - dat += "Send Message
" - dat += "
<< Discard Message
" + newmessagepriority = NO_NEW_MESSAGE + update_icon() + var/messageComposite = "" + for(var/msg in messages) // This puts more recent messages at the *top*, where they belong. + messageComposite = "
[msg]
" + messageComposite
+ dat += messageComposite
+ dat += "<< Back to Main Menu
" - if(10) //send announcement - dat += "
Station-wide Announcement
" - if(announceAuth) - dat += "Authentication accepted
" - else - dat += "
Swipe your card to authenticate yourself
" - dat += "Message: [message ? message : "No Message"]
" - dat += "[message ? "Edit" : "Write"] Message
" - if ((announceAuth || IsAdminGhost(user)) && message) - dat += "Announce Message
" - else - dat += "Announce Message
" - dat += "
<< Back
" + if(9) //authentication before sending + dat += "Message Authentication
" + dat += "Message for [dpt]: [message]
" + dat += "
You may authenticate your message now by scanning your ID or your stamp
" + + dat += "Validated by: [msgVerified ? "[msgVerified]" : "Not Validated"]
" + dat += "Stamped by: [msgStamped ? "[msgStamped]" : "Not Stamped"]
" + + dat += "Send Message
" + dat += "<< Discard Message
" - else //main menu - screen = 0 - announceAuth = FALSE - if (newmessagepriority == NORMAL_MESSAGE_PRIORITY) - dat += "
There are new messages
" - if (newmessagepriority == HIGH_MESSAGE_PRIORITY) - dat += "
There are new PRIORITY messages
" - if (newmessagepriority == EXTREME_MESSAGE_PRIORITY) - dat += "
There are new EXTREME PRIORITY messages
" - dat += "View Messages
" + if(10) //send announcement + dat += "
Station-wide Announcement
" + if(announceAuth) + dat += "Authentication accepted
" + else + dat += "
Swipe your card to authenticate yourself
" + dat += "Message: [message ? message : "No Message"]
" + dat += "[message ? "Edit" : "Write"] Message
" + if((announceAuth || IsAdminGhost(user)) && message) + dat += "Announce Message
" + else + dat += "Announce Message
" + dat += "
<< Back
" - dat += "Request Assistance
" - dat += "Request Supplies
" - dat += "Relay Anonymous Information
" + else //main menu + screen = 0 + announceAuth = FALSE + if(newmessagepriority == NORMAL_MESSAGE_PRIORITY) + dat += "
There are new messages
" + if(newmessagepriority == HIGH_MESSAGE_PRIORITY) + dat += "
There are new PRIORITY messages
" + if(newmessagepriority == EXTREME_MESSAGE_PRIORITY) + dat += "
There are new EXTREME PRIORITY messages
" - if(!emergency) - dat += "Emergency: Security
" - dat += "Emergency: Engineering
" - dat += "Emergency: Medical
" - else - dat += "[emergency] has been dispatched to this location.
" + dat += "View Messages
" - if(announcementConsole) - dat += "Send Station-wide Announcement
" - if (silent) - dat += "Speaker OFF" - else - dat += "Speaker ON" - var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return + dat += "Request Assistance
" + dat += "Request Supplies
" + dat += "Relay Anonymous Information
" + + if(!emergency) + dat += "Emergency: Security
" + dat += "Emergency: Engineering
" + dat += "Emergency: Medical
" + else + dat += "
[emergency] has been dispatched to this location.
" + + if(announcementConsole) + dat += "Send Station-wide Announcement
" + if(silent) + dat += "Speaker OFF" + else + dat += "Speaker ON" + + var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() /obj/machinery/requests_console/Topic(href, href_list) if(..()) return usr.set_machine(src) add_fingerprint(usr) - + if(href_list["write"]) dpt = ckey(reject_bad_text(href_list["write"])) //write contains the string of the receiving department's name var/new_message = stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN) if(new_message) message = new_message screen = 9 - if (text2num(href_list["priority"]) < 2) - priority = -1 - else - priority = text2num(href_list["priority"]) + priority = text2num(href_list["priority"]) else dpt = ""; msgVerified = "" msgStamped = "" screen = 0 - priority = -1 + priority = NORMAL_MESSAGE_PRIORITY //:salt: if(href_list["writeAnnouncement"]) var/new_message = reject_bad_text(stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN)) if(new_message) message = new_message - if (text2num(href_list["priority"]) < 2) - priority = -1 - else - priority = text2num(href_list["priority"]) + priority = text2num(href_list["priority"]) else message = "" announceAuth = FALSE @@ -296,106 +306,116 @@ GLOBAL_LIST_EMPTY(allConsoles) if(href_list["sendAnnouncement"]) if(!announcementConsole) + updateUsrDialog() return if(isliving(usr)) var/mob/living/L = usr message = L.treat_message(message) minor_announce(message, "[department] Announcement:") GLOB.news_network.SubmitArticle(message, department, "Station Announcements", null) - usr.log_talk(message, LOG_SAY, tag="station announcement from [src]") + usr.log_talk(message, LOG_SAY, tag = "station announcement from [src]") message_admins("[ADMIN_LOOKUPFLW(usr)] has made a station announcement from [src] at [AREACOORD(usr)].") announceAuth = FALSE message = "" screen = 0 if(href_list["emergency"]) - if(!emergency) - var/radio_freq - switch(text2num(href_list["emergency"])) - if(1) //Security - radio_freq = FREQ_SECURITY - emergency = "Security" - if(2) //Engineering - radio_freq = FREQ_ENGINEERING - emergency = "Engineering" - if(3) //Medical - radio_freq = FREQ_MEDICAL - emergency = "Medical" - if(radio_freq) - Radio.set_frequency(radio_freq) - Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq) - update_icon() - addtimer(CALLBACK(src, .proc/clear_emergency), 3000) + if(emergency) //already has an emergency? do not continue + updateUsrDialog() + return - if( href_list["department"] && message ) - var/log_msg = message + var/radio_freq + switch(text2num(href_list["emergency"])) + if(1) //Security + radio_freq = FREQ_SECURITY + emergency = "Security" + if(2) //Engineering + radio_freq = FREQ_ENGINEERING + emergency = "Engineering" + if(3) //Medical + radio_freq = FREQ_MEDICAL + emergency = "Medical" + if(radio_freq) + Radio.set_frequency(radio_freq) + Radio.talk_into(src, "[emergency] emergency in [department]!!", radio_freq) + update_icon() + addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES) + + if(href_list["department"] && message) var/sending = message sending += "
" - if (msgVerified) - sending += msgVerified - sending += "
" - if (msgStamped) - sending += msgStamped - sending += "
" - screen = 7 //if it's successful, this will get overrwritten (7 = unsufccessfull, 6 = successfull) - if (sending) - var/pass = FALSE - var/datum/data_rc_msg/log = new(href_list["department"], department, log_msg, msgStamped, msgVerified, priority) - for (var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list) - if (MS.toggled) - MS.rc_msgs += log - pass = TRUE + if(msgVerified) + sending += "[msgVerified]
" + if(msgStamped) + sending += "[msgStamped]
" + //so you're telling me is you cheated, by making fail happen, then quickly replacing it with 6 - if(pass) - var/radio_freq = 0 - switch(href_list["department"]) - if("bridge") - radio_freq = FREQ_COMMAND - if("medbay") - radio_freq = FREQ_MEDICAL - if("science") - radio_freq = FREQ_SCIENCE - if("engineering") - radio_freq = FREQ_ENGINEERING - if("security") - radio_freq = FREQ_SECURITY - if("cargobay" || "mining") - radio_freq = FREQ_SUPPLY - Radio.set_frequency(radio_freq) - var/authentic - if(msgVerified || msgStamped) - authentic = " (Authenticated)" + var/workingServer = FALSE + var/datum/data_rc_msg/log = new(href_list["department"], department, message, msgStamped, msgVerified, priority) + for(var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list) + if(MS.on) //on does the calculations. why would this server still work even though the apc is off?? + LAZYADD(MS.rc_msgs, log) + workingServer = TRUE - var/alert = "" - for (var/obj/machinery/requests_console/Console in GLOB.allConsoles) - if (ckey(Console.department) == ckey(href_list["department"])) - switch(priority) - if(2) //High priority - alert = "PRIORITY Alert in [department][authentic]" - Console.createmessage(src, alert, sending, 2, 1) - if(3) // Extreme Priority - alert = "EXTREME PRIORITY Alert from [department][authentic]" - Console.createmessage(src, alert , sending, 3, 1) - else // Normal priority - alert = "Message from [department][authentic]" - Console.createmessage(src, alert , sending, 1, 1) - screen = 6 + if(!workingServer) + screen = 7 + say("NOTICE: No server detected! Please contact your local engineering team.") + updateUsrDialog() + return - if(radio_freq) - Radio.talk_into(src, "[alert]: [message]", radio_freq) + var/radio_freq = 0 + switch(href_list["department"]) + if("bridge") + radio_freq = FREQ_COMMAND + if("medbay") + radio_freq = FREQ_MEDICAL + if("science") + radio_freq = FREQ_SCIENCE + if("engineering") + radio_freq = FREQ_ENGINEERING + if("security") + radio_freq = FREQ_SECURITY + if("cargobay" || "mining") + radio_freq = FREQ_SUPPLY + Radio.set_frequency(radio_freq) - switch(priority) - if(2) - messages += "High Priority
To: [dpt]
[sending]" - else - messages += "To: [dpt]
[sending]" + var/authentic = "" + if(msgVerified || msgStamped) + authentic = " (Authenticated)" + + var/alert = "" + for(var/obj/machinery/requests_console/C in GLOB.allConsoles) + if(ckey(C.department) != ckey(href_list["department"])) + continue + switch(priority) + if(HIGH_MESSAGE_PRIORITY) //High priority + alert = "PRIORITY Alert from [department][authentic]" + C.createmessage(src, alert, sending, HIGH_MESSAGE_PRIORITY) + if(EXTREME_MESSAGE_PRIORITY) // Extreme Priority + alert = "EXTREME PRIORITY Alert from [department][authentic]" + C.createmessage(src, alert, sending, EXTREME_MESSAGE_PRIORITY) + else // Normal priority + alert = "Message from [department][authentic]" + C.createmessage(src, alert, sending, NORMAL_MESSAGE_PRIORITY) + screen = 6 //if it ever gets here that means (c.department == href_ls["dept"]) + + if(radio_freq) + Radio.talk_into(src, "[alert]: [message]", radio_freq) + //log to (this) + switch(priority) + if(HIGH_MESSAGE_PRIORITY) + messages += "High Priority
To: [dpt]
[sending]" + if(EXTREME_MESSAGE_PRIORITY) + messages += "!!!Extreme Priority!!!
To: [dpt]
[sending]" else - say("NOTICE: No server detected!") + messages += "To: [dpt]
[sending]" //Handle screen switching switch(text2num(href_list["setScreen"])) if(null) //skip + updateUsrDialog() + return if(1) //req. assistance screen = 1 if(2) //req. supplies @@ -423,16 +443,14 @@ GLOBAL_LIST_EMPTY(allConsoles) msgVerified = "" msgStamped = "" message = "" - priority = -1 + priority = NORMAL_MESSAGE_PRIORITY // :salt: screen = 0 //Handle silencing the console - switch( href_list["setSilent"] ) - if(null) //skip - if("1") - silent = TRUE - else - silent = FALSE + if(href_list["setSilent"] == "1") + silent = TRUE + else + silent = FALSE updateUsrDialog() return @@ -457,31 +475,32 @@ GLOBAL_LIST_EMPTY(allConsoles) linkedsender = source capitalize(title) switch(priority) - if(2) //High priority + if(HIGH_MESSAGE_PRIORITY) //High priority if(newmessagepriority < HIGH_MESSAGE_PRIORITY) newmessagepriority = HIGH_MESSAGE_PRIORITY update_icon() if(!silent) playsound(src, 'sound/machines/twobeep.ogg', 50, 1) say(title) - messages += "High Priority
From: [linkedsender]
[message]" + messages += "High Priority
From: [linkedsender]
[message]" //the fuck is this not being sent - if(3) // Extreme Priority + if(EXTREME_MESSAGE_PRIORITY) // Extreme Priority if(newmessagepriority < EXTREME_MESSAGE_PRIORITY) newmessagepriority = EXTREME_MESSAGE_PRIORITY update_icon() - playsound(src, 'sound/machines/twobeep.ogg', 50, 1) - say(title) - messages += "!!!Extreme Priority!!!
From: [linkedsender]
[message]" + //we ignore the silent option because this is !!!IMPORTANT!!! + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) + say(title) + messages += "!!!Extreme Priority!!!
From: [linkedsender]
[message]" else // Normal priority if(newmessagepriority < NORMAL_MESSAGE_PRIORITY) newmessagepriority = NORMAL_MESSAGE_PRIORITY update_icon() - if(!src.silent) + if(!silent) playsound(src, 'sound/machines/twobeep.ogg', 50, 1) say(title) - messages += "From: [linkedsender]
[message]" + messages += "From: [linkedsender]
[message]" /obj/machinery/requests_console/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/crowbar)) @@ -505,23 +524,26 @@ GLOBAL_LIST_EMPTY(allConsoles) to_chat(user, "You must open the maintenance panel first!") return - var/obj/item/card/id/ID = O.GetID() - if(ID) + if(istype(O, /obj/item/card/id)) + var/obj/item/card/id/ID = O.GetID() + if(!ID) + return if(screen == 9) - msgVerified = "Verified by [ID.registered_name] ([ID.assignment])" + msgVerified = "Verified by [ID.registered_name] ([ID.assignment])" updateUsrDialog() if(screen == 10) - if (ACCESS_RC_ANNOUNCE in ID.access) + if(ACCESS_RC_ANNOUNCE in ID.access) announceAuth = TRUE else announceAuth = FALSE to_chat(user, "You are not authorized to send announcements!") updateUsrDialog() return - if (istype(O, /obj/item/stamp)) + + if(istype(O, /obj/item/stamp)) if(screen == 9) var/obj/item/stamp/T = O - msgStamped = "Stamped with the [T.name]" + msgStamped = "Stamped with the [T.name]" updateUsrDialog() return return ..() diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index f2b2c594b7..fdf6ba121c 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -1,215 +1,164 @@ - +/* + The log console for viewing the entire telecomms + network log +*/ /obj/machinery/computer/telecomms/server name = "telecommunications server monitoring console" icon_screen = "comm_logs" desc = "Has full access to all details and record of the telecommunications network it's monitoring." + circuit = /obj/item/circuitboard/computer/comm_server + req_access = list(ACCESS_TCOMSAT) - var/screen = 0 // the screen number: - var/list/servers = list() // the servers located by the computer - var/obj/machinery/telecomms/server/SelectedServer + var/list/machinelist = list() // the servers located by the computer + var/obj/machinery/telecomms/server/SelectedMachine = null var/network = "NULL" // the network to probe - var/temp = "" // temporary feedback messages + var/notice = "" + var/universal_translate = FALSE // set to TRUE(1) if it can translate nonhuman speech - var/universal_translate = 0 // set to 1 if it can translate nonhuman speech +/obj/machinery/computer/telecomms/server/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "tcommsserver", "Telecomms Server Monitor", 575, 400, master_ui, state) + ui.open() - req_access = list(ACCESS_TCOMSAT) - circuit = /obj/item/circuitboard/computer/comm_server +/obj/machinery/computer/telecomms/server/ui_data(mob/user) + var/list/data_out = list() + data_out["network"] = network + data_out["notice"] = notice -/obj/machinery/computer/telecomms/server/ui_interact(mob/user) - . = ..() - var/dat = "
[temp]
" - dat += "
Current Network: [network]
" - if(servers.len) - dat += "
Detected Telecommunication Servers:
- "
- for(var/obj/machinery/telecomms/T in servers)
- dat += "
- [REF(T)] [T.name] ([T.id]) " - dat += "
\[Flush Buffer\]" + if(C.input_type == "Speech File") //there is a reason why this is not a switch. + data["source"] = list( + name = C.parameters["name"], //name of the mob | obj + job = C.parameters["job"] //job of the mob | obj + ) + // -- Determine race of orator -- + var/mobtype = C.parameters["mobtype"] + var/race // The actual race of the mob + + if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain)) + race = "Humanoid" + else if(ispath(mobtype, /mob/living/simple_animal/slime)) + race = "Slime" // NT knows a lot about slimes, but not aliens. Can identify slimes + else if(ispath(mobtype, /mob/living/carbon/monkey)) + race = "Monkey" + else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == "AI") + race = "Artificial Life" // sometimes M gets deleted prematurely for AIs... just check the job + else if(isobj(mobtype)) + race = "Machinery" + else if(ispath(mobtype, /mob/living/simple_animal)) + race = "Domestic Animal" else - dat += "
No servers detected. Scan for servers: \[Scan\]" + race = "Unidentifiable" + data["race"] = race + // based on [/atom/movable/proc/lang_treat] + var/message = C.parameters["message"] + var/language = C.parameters["language"] - // --- Viewing Server --- + if(universal_translate || user.has_language(language)) + message = message + else if(!user.has_language(language)) + var/datum/language/D = GLOB.language_datum_instances[language] + message = D.scramble(message) + else if(language) + message = "(unintelligible)" - if(1) - dat += "
[temp]
" - dat += "
Current Network: [network]" - dat += "
Selected Server: [SelectedServer.id]" + data["message"] = message - if(SelectedServer.totaltraffic >= 1024) - dat += "
Total recorded traffic: [round(SelectedServer.totaltraffic / 1024)] Terrabytes
" - else - dat += "
Total recorded traffic: [SelectedServer.totaltraffic] Gigabytes
" + else if(C.input_type == "Execution Error") + data["message"] = C.parameters["message"] + else + data["message"] = "(unintelligible)" + + data_out["selected_logs"] += list(data) + return data_out - dat += "Stored Logs:
- "
-
- var/i = 0
- for(var/datum/comm_log_entry/C in SelectedServer.log_entries)
- i++
-
-
- // If the log is a speech file
- if(C.input_type == "Speech File")
- dat += "
- [C.name] \[X\]
" - - // -- Determine race of orator -- - - var/mobtype = C.parameters["mobtype"] - var/race // The actual race of the mob - - if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain)) - race = "Humanoid" - - // NT knows a lot about slimes, but not aliens. Can identify slimes - else if(ispath(mobtype, /mob/living/simple_animal/slime)) - race = "Slime" - - else if(ispath(mobtype, /mob/living/carbon/monkey)) - race = "Monkey" - - // sometimes M gets deleted prematurely for AIs... just check the job - else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == "AI") - race = "Artificial Life" - - else if(isobj(mobtype)) - race = "Machinery" - - else if(ispath(mobtype, /mob/living/simple_animal)) - race = "Domestic Animal" - - else - race = "Unidentifiable" - - dat += "Data type: [C.input_type]
" - dat += "Source: [C.parameters["name"]] (Job: [C.parameters["job"]])
" - dat += "Class: [race]
" - var/message = C.parameters["message"] - var/language = C.parameters["language"] - - // based on [/atom/movable/proc/lang_treat] - if (universal_translate || user.has_language(language)) - message = "\"[message]\"" - else if (!user.has_language(language)) - var/datum/language/D = GLOB.language_datum_instances[language] - message = "\"[D.scramble(message)]\"" - else if (language) - message = "(unintelligible)" - - dat += "Contents: [message]
" - dat += " - [C.name] \[X\]
" - dat += "Error: \"[C.parameters["message"]]\"
" - dat += " - [C.name] \[X\]
" - dat += "Data type: [C.input_type]
" - dat += "Contents: (unintelligible)
" - dat += "
" - - else if(C.input_type == "Execution Error") - dat += "
" - - else - dat += "
" - - - dat += "
�%@%(*$%&(�&?*(%&�/{}" - var/time = 100 * length(linkedServer.decryptkey) - addtimer(CALLBACK(src, .proc/UnmagConsole), time) - message = rebootmsg + addtimer(CALLBACK(src, .proc/UnmagConsole), (10 SECONDS) * length(linkedServer.decryptkey)) + //message = rebootmsg return TRUE /obj/machinery/computer/message_monitor/New() . = ..() GLOB.telecomms_list += src -/obj/machinery/computer/message_monitor/Initialize() - ..() - return INITIALIZE_HINT_LATELOAD - -/obj/machinery/computer/message_monitor/LateInitialize() - //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. - if(!linkedServer) - for(var/obj/machinery/telecomms/message_server/S in GLOB.telecomms_list) - linkedServer = S - break - /obj/machinery/computer/message_monitor/Destroy() GLOB.telecomms_list -= src . = ..() -/obj/machinery/computer/message_monitor/ui_interact(mob/living/user) - . = ..() - //If the computer is being hacked or is emagged, display the reboot message. - if(hacking || (obj_flags & EMAGGED)) - message = rebootmsg - var/dat = "
\[Authenticated\] /"
- dat += " Server Power: [linkedServer && linkedServer.toggled ? "\[On\]":"\[Off\]"]
"
- else
- dat += " \[Unauthenticated\] /"
- dat += " Server Power: [linkedServer && linkedServer.toggled ? "\[On\]":"\[Off\]"]
"
-
- if(hacking || (obj_flags & EMAGGED))
- screen = 2
- else if(!auth || LINKED_SERVER_NONRESPONSIVE)
- if(LINKED_SERVER_NONRESPONSIVE)
- message = noserver
- screen = 0
-
- switch(screen)
- //Main menu
- if(0)
- // = TAB
- var/i = 0
- dat += "" - - //Bottom message - if(!auth) - dat += "
" - dat += "
| X | Sender | Recipient | Message |
|---|---|---|---|
| [pda.sender] | [pda.recipient] | [pda.message][pda.picture ? " (Photo)":""] |
It will take 20 seconds for every character that the password has." - dat += "In the meantime, this console can reveal your true intentions if you let someone access it. Make sure no humans enter the room during that time." - else - //It's the same message as the one above but in binary. Because robots understand binary and humans don't... well I thought it was clever. - dat += {"01000010011100100111010101110100011001010010110
- 10110011001101111011100100110001101101001011011100110011
- 10010000001100110011011110111001000100000011100110110010
- 10111001001110110011001010111001000100000011010110110010
- 10111100100101110001000000100100101110100001000000111011
- 10110100101101100011011000010000001110100011000010110101
- 10110010100100000001100100011000000100000011100110110010
- 10110001101101111011011100110010001110011001000000110011
- 00110111101110010001000000110010101110110011001010111001
- 00111100100100000011000110110100001100001011100100110000
- 10110001101110100011001010111001000100000011101000110100
- 00110000101110100001000000111010001101000011001010010000
- 00111000001100001011100110111001101110111011011110111001
- 00110010000100000011010000110000101110011001011100010000
- 00100100101101110001000000111010001101000011001010010000
- 00110110101100101011000010110111001110100011010010110110
- 10110010100101100001000000111010001101000011010010111001
- 10010000001100011011011110110111001110011011011110110110
- 00110010100100000011000110110000101101110001000000111001
- 00110010101110110011001010110000101101100001000000111100
- 10110111101110101011100100010000001110100011100100111010
- 10110010100100000011010010110111001110100011001010110111
- 00111010001101001011011110110111001110011001000000110100
- 10110011000100000011110010110111101110101001000000110110
- 00110010101110100001000000111001101101111011011010110010
- 10110111101101110011001010010000001100001011000110110001
- 10110010101110011011100110010000001101001011101000010111
- 00010000001001101011000010110101101100101001000000111001
- 10111010101110010011001010010000001101110011011110010000
- 00110100001110101011011010110000101101110011100110010000
- 00110010101101110011101000110010101110010001000000111010
- 00110100001100101001000000111001001101111011011110110110
- 10010000001100100011101010111001001101001011011100110011
- 10010000001110100011010000110000101110100001000000111010
- 001101001011011010110010100101110"} - - //Fake messages - if(3) - dat += "
" - - dat += {"
| Sender | -Sender's Job | -Recipient | -Message |
| [customsender] | -[customjob] | -[customrecepient ? customrecepient.owner : "NONE"] | -[custommessage] |
" - dat += {"
| X | Sending Dep. | Receiving Dep. | -Message | Stamp | ID Auth. | Priority. |
|---|---|---|---|---|---|---|
| [rc.send_dpt] | -[rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] |
[temp]
" - dat += "
Current Network: [network]
" - if(machinelist.len) - dat += "
Detected Network Entities:
- "
- for(var/obj/machinery/telecomms/T in machinelist)
- dat += "
- [REF(T)] [T.name] ([T.id]) " - dat += "
\[Flush Buffer\]" - else - dat += "\[Probe Network\]" + if(!SelectedMachine) //null is bad. + data_out["selected"] = null //but in js, null is good. + return data_out + + data_out["selected"] = list( + name = SelectedMachine.name, + id = SelectedMachine.id, + status = SelectedMachine.on, + traffic = SelectedMachine.traffic, + netspeed = SelectedMachine.netspeed, + freq_listening = SelectedMachine.freq_listening, + long_range_link = SelectedMachine.long_range_link, + ref = REF(SelectedMachine) + ) + data_out["selected_servers"] = list() + for(var/obj/machinery/telecomms/T in SelectedMachine.links) + if(!T.hide) + var/list/data = list( + name = T.name, + id = T.id, + ref = REF(T) + ) + data_out["selected_servers"] += list(data) + return data_out - // --- Viewing Machine --- - - if(1) - dat += "
[temp]
" - dat += "
Current Network: [network]
" - dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
" - dat += "Linked Entities:
- "
- for(var/obj/machinery/telecomms/T in SelectedMachine.links)
- if(!T.hide)
- dat += "
- [REF(T.id)] [T.name] ([T.id]) " - dat += "
[name] Access
[temp]
" - dat += "
Power Status: [toggled ? "On" : "Off"]" - if(on && toggled) - if(id != "" && id) - dat += "
Identification String: [id]" - else - dat += "
Identification String: NULL" - dat += "
Network: [network]" - dat += "
Prefabrication: [autolinkers.len ? "TRUE" : "FALSE"]" - if(hide) - dat += "
Shadow Link: ACTIVE" + if(P) + .["multitool"] = TRUE + .["multitool_buf"] = null //to clean the list! + var/obj/machinery/telecomms/T = P.buffer + if(istype(T)) + .["multitool_buf"] = list( + name = T.name, + id = T.id + ) - //Show additional options for certain machines. - dat += Options_Menu() + .["machine"] = list() + .["machine"]["power"] = toggled + .["machine"]["id"] = id + .["machine"]["network"] = network + .["machine"]["prefab"] = LAZYLEN(autolinkers) ? TRUE : FALSE + .["machine"]["hidden"] = hide - dat += "
Linked Network Entities:
- "
+ .["links"] = list()
+ for(var/obj/machinery/telecomms/T in links)
+ if(T.hide && !hide)
+ continue
+ var/list/data = list(
+ name = T.name,
+ id = T.id,
+ ref = REF(T)
+ )
+ .["links"] += list(data)
- var/i = 0
- for(var/obj/machinery/telecomms/T in links)
- i++
- if(T.hide && !hide)
- continue
- dat += "
- [REF(T)] [T.name] ([T.id]) \[X\] " - dat += "
Filtering Frequencies: " +/obj/machinery/telecomms/relay/ui_data(mob/user) + . = ..() + .["machine"]["isrelay"] = TRUE + .["machine"]["broadcast"] = broadcasting + .["machine"]["receiving"] = receiving - i = 0 - if(length(freq_listening)) - for(var/x in freq_listening) - i++ - if(i < length(freq_listening)) - dat += "[format_frequency(x)] GHz\[X\]; " - else - dat += "[format_frequency(x)] GHz\[X\]" - else - dat += "NONE" +/obj/machinery/telecomms/bus/ui_data(mob/user) + . = ..() + .["machine"]["isbus"] = TRUE + .["machine"]["chang_frequency"] = change_frequency + .["machine"]["chang_freq_value"] = change_freq_value - dat += "
\[Add Filter\]" - dat += "
" - - if(P) - var/obj/machinery/telecomms/T = P.buffer - if(istype(T)) - dat += "
MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" - else - dat += "
MULTITOOL BUFFER: \[Add Machine\]" - - dat += "" +/obj/machinery/telecomms/ui_act(action, params, datum/tgui/ui) + if(!canInteract(usr)) + if(ui) + ui.close() //haha no. + return temp = "" - user << browse(dat, "window=tcommachine;size=520x500;can_resize=0") - onclose(user, "tcommachine") - return TRUE + + switch(action) + if("toggle") + toggled = !toggled + temp = "-% [src.name] has been [toggled ? "activated" : "deactivated"]. %-" + update_power() + return + if("machine") + if("id" in params) + if(!canAccess(usr)) + return + //if the text is blank, return the id it was using + var/newid = sanitize_text(reject_bad_text(params["id"]), id) // reject_bad_text can return null! + if(length(newid) > 255) + temp = "-% Too many characters in new id tag. %-" + return + temp = "-% New ID assigned: \"[newid]\". %-" + id = newid + return + if("network" in params) + if(!canAccess(usr)) + return + var/newnet = sanitize(sanitize_text(params["network"], network)) + if(length(newnet) > 15) + temp = "-% Too many characters in new network tag. %-" + return + network = newnet + links = list() + temp = "-% New network tag assigned: \"[network]\" %-" + return + if("multitool") + var/obj/item/multitool/P = get_multitool(usr) + if("Link" in params) + if(!canAccess(usr)) + return + if(!istype(P)) + temp = "-% Unable to acquire buffer %-" + return + + var/obj/machinery/telecomms/T = P.buffer + if(!istype(T) || T == src) + temp = "-% Unable to acquire buffer %-" + return + + if(!(src in T.links)) + LAZYADD(T.links, src) + + if(!(T in links)) + LAZYADD(links, T) + temp = "-% Successfully linked with [REF(T)] [T.name] %-" + + if("Flush" in params) + if(!istype(P)) + temp = "-% Unable to acquire multitool %-" + return + + temp = "-% Buffer successfully flushed. %-" + P.buffer = null + + if("Add" in params) + if(!canAccess(usr)) + return + if(!istype(P)) + temp = "-% Unable to acquire multitool %-" + return + + P.buffer = src + temp = "% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-" + + if("unlink") + var/obj/machinery/telecomms/T = locate(params["value"]) + if(!canAccess(usr)) + return + if(!istype(T)) + temp = "-% Unable to locate machine to unlink from, try again. %-" + return + + temp = "-% Removed [REF(T)] [T.name] from linked entities. %-" + if(T.links) //lazyrem makes blank list null, which is good but some might cause runtime ee's + T.links.Remove(src) + links.Remove(T) + if("freq") + if("add" in params) + var/newfreq = input("Specify a new frequency to filter (GHz). Decimals assigned automatically.", src.name, null) as null|num + if(!canAccess(usr) || !newfreq || isnull(newfreq)) + return + + if(findtext(num2text(newfreq), ".")) // did they not read the text? + newfreq *= 10 // shift the decimal one place + + newfreq = sanitize_frequency(newfreq, TRUE) //sanitize + if(newfreq == FREQ_SYNDICATE) + temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-" + return + if(newfreq in freq_listening) + temp = "-% Error: Frequency already filtered %-" + return + + LAZYADD(freq_listening, newfreq) + temp = "-% New frequency filter assigned: \"[newfreq] GHz\" %-" + + if("remove" in params) + if(!canAccess(usr)) + return + var/x = text2num(params["remove"]) + temp = "-% Removed frequency filter [x] %-" + freq_listening.Remove(x) + +/obj/machinery/telecomms/relay/ui_act(action, params) + ..() + switch(action) + if("relay") + if("broadcast" in params) + if(!canAccess(usr)) + return + broadcasting = !broadcasting + temp = "-% Broadcasting mode changed. %-" + return + if("receiving" in params) + if(!canAccess(usr)) + return + receiving = !receiving + temp = "-% Receiving mode changed. %-" + +/obj/machinery/telecomms/bus/ui_act(action, params) + ..() + switch(action) + if("frequency") + if("toggle" in params) + if(!canAccess(usr)) + return + change_frequency = !change_frequency + return + if("adjust" in params) + var/newfreq = text2num(params["adjust"]) + if(!canAccess(usr) || !newfreq) + return + // this should return true, unless the href is handcrafted + if(findtext(num2text(newfreq), ".")) + newfreq *= 10 // shift the decimal one place + + newfreq = sanitize_frequency(newfreq, TRUE) + if(newfreq == FREQ_SYNDICATE) + temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-" + return + + change_freq_value = newfreq + temp = "-% New frequency to change to assigned: \"[newfreq] GHz\" %-" + return + +// Check if the user can use it. +/obj/machinery/telecomms/proc/canInteract(mob/user) + if(hasSiliconAccessInArea(user) || istype(user.get_active_held_item(), /obj/item/multitool)) + return TRUE + return FALSE +// Check if the user is nearby and has a multitool. +/obj/machinery/telecomms/proc/canAccess(mob/user) + if((canInteract(user) && in_range(user, src)) || hasSiliconAccessInArea(user)) + return TRUE + return FALSE // Returns a multitool from a user depending on their mobtype. - /obj/machinery/telecomms/proc/get_multitool(mob/user) - - var/obj/item/multitool/P = null - // Let's double check - if(!hasSiliconAccessInArea(user) && istype(user.get_active_held_item(), /obj/item/multitool)) - P = user.get_active_held_item() + if(!canInteract(user)) + return null + var/obj/item/multitool/P = user.get_active_held_item() + // Is the ref not a null? and is it the actual type? + if(istype(P)) + return P else if(isAI(user)) var/mob/living/silicon/ai/U = user P = U.aiMulti @@ -106,170 +268,3 @@ if(istype(user.get_active_held_item(), /obj/item/multitool)) P = user.get_active_held_item() return P - -// Additional Options for certain machines. Use this when you want to add an option to a specific machine. -// Example of how to use below. - -/obj/machinery/telecomms/proc/Options_Menu() - return "" - -// The topic for Additional Options. Use this for checking href links for your specific option. -// Example of how to use below. -/obj/machinery/telecomms/proc/Options_Topic(href, href_list) - return - -// RELAY - -/obj/machinery/telecomms/relay/Options_Menu() - var/dat = "" - dat += "
Broadcasting: [broadcasting ? "YES" : "NO"]" - dat += "
Receiving: [receiving ? "YES" : "NO"]" - return dat - -/obj/machinery/telecomms/relay/Options_Topic(href, href_list) - - if(href_list["receive"]) - receiving = !receiving - temp = "-% Receiving mode changed. %-" - if(href_list["broadcast"]) - broadcasting = !broadcasting - temp = "-% Broadcasting mode changed. %-" - -// BUS - -/obj/machinery/telecomms/bus/Options_Menu() - var/dat = "
Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" - return dat - -/obj/machinery/telecomms/bus/Options_Topic(href, href_list) - - if(href_list["change_freq"]) - - var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num - if(canAccess(usr)) - if(newfreq) - if(findtext(num2text(newfreq), ".")) - newfreq *= 10 // shift the decimal one place - if(newfreq < 10000) - change_frequency = newfreq - temp = "-% New frequency to change to assigned: \"[newfreq] GHz\" %-" - else - change_frequency = 0 - temp = "-% Frequency changing deactivated %-" - - -/obj/machinery/telecomms/Topic(href, href_list) - if(..()) - return - - if(!hasSiliconAccessInArea(usr)) - if(!istype(usr.get_active_held_item(), /obj/item/multitool)) - return - - var/obj/item/multitool/P = get_multitool(usr) - - if(href_list["input"]) - switch(href_list["input"]) - - if("toggle") - - toggled = !toggled - temp = "-% [src] has been [toggled ? "activated" : "deactivated"]." - update_power() - - - if("id") - var/newid = reject_bad_text(stripped_input(usr, "Specify the new ID for this machine", src, id, MAX_MESSAGE_LEN)) - if(newid && canAccess(usr)) - id = newid - temp = "-% New ID assigned: \"[id]\" %-" - - if("network") - var/newnet = stripped_input(usr, "Specify the new network for this machine. This will break all current links.", src, network) - if(newnet && canAccess(usr)) - - if(length(newnet) > 15) - temp = "-% Too many characters in new network tag %-" - - else - for(var/obj/machinery/telecomms/T in links) - T.links.Remove(src) - - network = newnet - links = list() - temp = "-% New network tag assigned: \"[network]\" %-" - - - if("freq") - var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num - if(newfreq && canAccess(usr)) - if(findtext(num2text(newfreq), ".")) - newfreq *= 10 // shift the decimal one place - if(newfreq == FREQ_SYNDICATE) - temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-" - else - if(!(newfreq in freq_listening) && newfreq < 10000) - freq_listening.Add(newfreq) - temp = "-% New frequency filter assigned: \"[newfreq] GHz\" %-" - - if(href_list["delete"]) - - // changed the layout about to workaround a pesky runtime -- Doohl - - var/x = text2num(href_list["delete"]) - temp = "-% Removed frequency filter [x] %-" - freq_listening.Remove(x) - - if(href_list["unlink"]) - - if(text2num(href_list["unlink"]) <= length(links)) - var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])] - if(T) - temp = "-% Removed [REF(T)] [T.name] from linked entities. %-" - - // Remove link entries from both T and src. - - if(T.links) - T.links.Remove(src) - links.Remove(T) - - else - temp = "-% Unable to locate machine to unlink from, try again. %-" - - if(href_list["link"]) - - if(P) - var/obj/machinery/telecomms/T = P.buffer - if(istype(T) && T != src) - if(!(src in T.links)) - T.links += src - - if(!(T in links)) - links += T - - temp = "-% Successfully linked with [REF(T)] [T.name] %-" - - else - temp = "-% Unable to acquire buffer %-" - - if(href_list["buffer"]) - - P.buffer = src - temp = "-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-" - - - if(href_list["flush"]) - - temp = "-% Buffer successfully flushed. %-" - P.buffer = null - - Options_Topic(href, href_list) - - usr.set_machine(src) - - updateUsrDialog() - -/obj/machinery/telecomms/proc/canAccess(mob/user) - if(hasSiliconAccessInArea(user) || in_range(user, src)) - return TRUE - return FALSE diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 4732c5bddd..bf3dfe8f7e 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -17,7 +17,8 @@ idle_power_usage = 50 netspeed = 40 circuit = /obj/item/circuitboard/machine/telecomms/bus - var/change_frequency = 0 + var/change_frequency = FALSE + var/change_freq_value = 0 /obj/machinery/telecomms/bus/RefreshParts() idle_power_usage = 50 @@ -28,8 +29,8 @@ if(!istype(signal) || !is_freq_listening(signal)) return - if(change_frequency && signal.frequency != FREQ_SYNDICATE) - signal.frequency = change_frequency + if(change_frequency && (change_freq_value && signal.frequency != FREQ_SYNDICATE)) + signal.frequency = change_freq_value if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it // send to one linked processor unit diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index ed39bb0578..7f8872ca74 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -140,11 +140,16 @@ ..() if(href_list["photo"]) var/mob/M = usr - M << browse_rsc(picture.picture_image, "pda_photo.png") - M << browse("
" \
- + "", "window=pdaphoto;size=[picture.psize_x]x[picture.psize_y];can-close=true")
+
+ M << browse_rsc(picture.picture_image, "pda_photo.png")
+
+ var/dat = ""
+
+ var/datum/browser/popup = new(M, "pdaphoto", "PDA Photo", picture.psize_x, picture.psize_y)
+ popup.set_content(dat)
+ popup.open()
onclose(M, "pdaphoto")
/datum/data_rc_msg
diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm
index ad4599b4c3..6f80cfbf0e 100644
--- a/code/game/machinery/telecomms/machines/server.dm
+++ b/code/game/machinery/telecomms/machines/server.dm
@@ -33,7 +33,7 @@
totaltraffic += traffic // add current traffic to total traffic
// Delete particularly old logs
- if (log_entries.len >= 400)
+ if(LAZYLEN(log_entries) >= 400) //[list].len is not safe
log_entries.Cut(1, 2)
var/datum/comm_log_entry/log = new
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index d21edffea1..e1b345f507 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -117,9 +117,9 @@ GLOBAL_LIST_EMPTY(telecomms_list)
icon_state = "[initial(icon_state)]_off"
/obj/machinery/telecomms/proc/update_power()
-
if(toggled)
- if(stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off
+ // if powered, on. if not powered, off. if too damaged, off
+ if(CHECK_BITFIELD(stat, (BROKEN | NOPOWER | EMPED)))
on = FALSE
else
on = TRUE
@@ -137,11 +137,11 @@ GLOBAL_LIST_EMPTY(telecomms_list)
/obj/machinery/telecomms/emp_act(severity)
. = ..()
- if(. & EMP_PROTECT_SELF)
+ if(CHECK_BITFIELD(., EMP_PROTECT_SELF))
return
- if(prob(100/severity))
- if(!(stat & EMPED))
- stat |= EMPED
- var/duration = (300 * 10)/severity
+ if(prob(100 / severity))
+ if(!CHECK_BITFIELD(stat, EMPED))
+ ENABLE_BITFIELD(stat, EMPED)
+ var/duration = (300 * 10) / severity
spawn(rand(duration - 20, duration + 20)) // Takes a long time for the machines to reboot.
- stat &= ~EMPED
+ DISABLE_BITFIELD(stat, EMPED)
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 19b6d0a9bd..5160282180 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -5,44 +5,42 @@
var/base_icon
var/looky_helpy = TRUE
-/datum/component/construction/mecha/examine(mob/user)
+/datum/component/construction/mecha/examine(datum/source, mob/user, list/examine_list)
. = ..()
if(looky_helpy)
switch(steps[index]["key"])
if(TOOL_WRENCH)
- . += "The mech could be wrenched into place."
+ examine_list += "The mech could be wrenched into place."
if(TOOL_SCREWDRIVER)
- . += "The mech could be screwed into place."
+ examine_list += "The mech could be screwed into place."
if(TOOL_WIRECUTTER)
- . += "The mech wires could be trimmed into place."
+ examine_list += "The mech wires could be trimmed into place."
if(/obj/item/stack/cable_coil)
- . += "The mech could use some wiring."
+ examine_list += "The mech could use some wiring."
if(/obj/item/circuitboard)
- . += "The mech could use a type ofcircuitboard."
+ examine_list += "The mech could use a type ofcircuitboard."
if(/obj/item/stock_parts/scanning_module)
- . += "The mech could use a scanning stock part."
+ examine_list += "The mech could use a scanning stock part."
if(/obj/item/stock_parts/capacitor)
- . += "The mech could use a power based stock part."
+ examine_list += "The mech could use a power based stock part."
if(/obj/item/stock_parts/cell)
- . += "The mech could use a power source."
+ examine_list += "The mech could use a power source."
if(/obj/item/stack/sheet/metal)
- . += "The mech could use some sheets of metal."
+ examine_list += "The mech could use some sheets of metal."
if(/obj/item/stack/sheet/plasteel)
- . += "The mech could use some sheets of strong steel."
+ examine_list += "The mech could use some sheets of strong steel."
if(/obj/item/bikehorn)
- . += "HONK IT!."
+ examine_list += "HONK IT!."
if(/obj/item/clothing/mask/gas/clown_hat)
- . += "GIVE IT CLOWN MAKEUP HONK!."
+ examine_list += "GIVE IT CLOWN MAKEUP HONK!."
if(/obj/item/clothing/shoes/clown_shoes)
- . += "GIVE IT GOOFY SHOES HONK HONK!."
+ examine_list += "GIVE IT GOOFY SHOES HONK HONK!."
if(/obj/item/mecha_parts/part)
- . += "The mech could use a mech part."
+ examine_list += "The mech could use a mech part."
if(/obj/item/stack/ore/bluespace_crystal)
- . += "The mech could use a crystal of sorts."
+ examine_list += "The mech could use a crystal of sorts."
if(/obj/item/assembly/signaler/anomaly)
- . += "The mech could use a anomaly of sorts."
- else
- return
+ examine_list += "The mech could use a anomaly of sorts."
/datum/component/construction/mecha/spawn_result()
if(!result)
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index 1fe7f74dec..395ac810f4 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -282,9 +282,9 @@
else
return ..()
-/obj/mecha/attacked_by(obj/item/I, mob/living/user)
+/obj/mecha/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
mecha_log_message("Attacked by [I]. Attacker - [user]")
- ..()
+ return ..()
/obj/mecha/proc/mech_toxin_damage(mob/living/target)
playsound(src, 'sound/effects/spray2.ogg', 50, 1)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 9893e9c7d3..5b2006b6f3 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -611,13 +611,13 @@
/obj/item/clothing/mask/breath = 5,
/obj/item/clothing/mask/breath/medical = 1
)
-
+
/obj/effect/spawner/lootdrop/welder_tools/no_turf
spawn_on_turf = FALSE
/obj/effect/spawner/lootdrop/low_tools/no_turf
spawn_on_turf = FALSE
-
+
/obj/effect/spawner/lootdrop/breathing_tanks/no_turf
spawn_on_turf = FALSE
@@ -644,3 +644,90 @@
/obj/effect/spawner/lootdrop/glowstick/no_turf
spawn_on_turf = FALSE
+
+// Random Parts
+
+/obj/effect/spawner/lootdrop/stock_parts
+ name = "random stock parts spawner"
+ lootcount = 1
+ loot = list(
+ /obj/item/stock_parts/capacitor,
+ /obj/item/stock_parts/scanning_module,
+ /obj/item/stock_parts/manipulator,
+ /obj/item/stock_parts/micro_laser,
+ /obj/item/stock_parts/matter_bin,
+ /obj/item/stock_parts/cell
+ )
+
+// Random Weapon Parts
+
+/obj/effect/spawner/lootdrop/weapon_parts
+ name = "random weapon parts spawner 50%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 50,
+ /obj/item/weaponcrafting/improvised_parts/barrel_rifle = 10,
+ /obj/item/weaponcrafting/improvised_parts/barrel_shotgun = 5,
+ /obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
+ /obj/item/weaponcrafting/improvised_parts/rifle_receiver = 10,
+ /obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 3,
+ /obj/item/weaponcrafting/improvised_parts/pistol_receiver = 3,
+ /obj/item/weaponcrafting/improvised_parts/laser_receiver = 1,
+ /obj/item/weaponcrafting/improvised_parts/trigger_assembly = 10,
+ /obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
+ )
+
+/obj/effect/spawner/lootdrop/weapon_parts
+ name = "random weapon parts spawner 25%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 75,
+ /obj/item/weaponcrafting/improvised_parts/barrel_rifle = 5,
+ /obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
+ /obj/item/weaponcrafting/improvised_parts/rifle_receiver = 5,
+ /obj/item/weaponcrafting/improvised_parts/pistol_receiver = 2,
+ /obj/item/weaponcrafting/improvised_parts/trigger_assembly = 5,
+ /obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
+ )
+
+/obj/effect/spawner/lootdrop/ammo
+ name = "random ammo 75%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 25,
+ /obj/item/ammo_box/c32mm = 15,
+ /obj/item/ammo_box/r32mm = 15,
+ /obj/item/ammo_box/magazine/wt550m9 = 1,
+ /obj/item/ammo_casing/shotgun/buckshot = 7,
+ /obj/item/ammo_casing/shotgun/rubbershot = 7,
+ /obj/item/ammo_casing/a762 = 15,
+ /obj/item/ammo_box/a762 = 15,
+ )
+
+/obj/effect/spawner/lootdrop/ammo/fiftypercent
+ name = "random ammo 50%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 50,
+ /obj/item/ammo_box/c32mm = 7,
+ /obj/item/ammo_box/r32mm = 7,
+ /obj/item/ammo_box/magazine/wt550m9 = 2,
+ /obj/item/ammo_casing/shotgun/buckshot = 10,
+ /obj/item/ammo_casing/shotgun/rubbershot = 10,
+ /obj/item/ammo_casing/a762 = 7,
+ /obj/item/ammo_box/a762 = 7,
+ )
+
+/obj/effect/spawner/lootdrop/ammo/shotgun
+ name = "random ammo 50%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 50,
+ /obj/item/ammo_box/shotgun/loaded/buckshot = 5,
+ /obj/item/ammo_box/shotgun/loaded/beanbag = 5,
+ /obj/item/ammo_box/shotgun/loaded/incendiary = 5,
+ /obj/item/ammo_casing/shotgun/buckshot = 8,
+ /obj/item/ammo_casing/shotgun/rubbershot = 9,
+ /obj/item/ammo_casing/shotgun = 8,
+ /obj/item/ammo_casing/shotgun/incendiary = 10,
+ )
diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm
index 59c4e23283..9a236c00c3 100644
--- a/code/game/objects/effects/temporary_visuals/clockcult.dm
+++ b/code/game/objects/effects/temporary_visuals/clockcult.dm
@@ -95,6 +95,56 @@
icon_state = "warden_gaze"
duration = 3
+/obj/effect/temp_visual/ratvar/volt_hit
+ name = "volt blast"
+ layer = ABOVE_MOB_LAYER
+ duration = 8
+ icon_state = "volt_hit"
+ light_range = 1.5
+ light_power = 2
+ light_color = LIGHT_COLOR_ORANGE
+ var/mob/user
+ var/damage = 20
+
+/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster)
+ . = ..()
+ user = caster
+ if(user)
+ var/matrix/M = new
+ M.Turn(Get_Angle(src, user))
+ transform = M
+ INVOKE_ASYNC(src, .proc/volthit)
+
+/obj/effect/temp_visual/ratvar/volt_hit/proc/volthit()
+ if(user)
+ Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray)
+ var/hit_amount = 0
+ var/turf/T = get_turf(src)
+ for(var/mob/living/L in T)
+ if(is_servant_of_ratvar(L))
+ continue
+ var/obj/item/I = L.anti_magic_check()
+ if(I)
+ L.visible_message("Strange energy flows into [L]'s [I.name]!", \
+ "Your [I.name] shields you from [src]!")
+ continue
+ L.visible_message("[L] is struck by a [name]!", "You're struck by a [name]!")
+ L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
+ log_combat(user, L, "struck with a volt blast")
+ hit_amount++
+ for(var/obj/mecha/M in T)
+ if(M.occupant)
+ if(is_servant_of_ratvar(M.occupant))
+ continue
+ to_chat(M.occupant, "Your [M.name] is struck by a [name]!")
+ M.visible_message("[M] is struck by a [name]!")
+ M.take_damage(damage, BURN, 0, 0)
+ hit_amount++
+ if(hit_amount)
+ playsound(src, 'sound/machines/defib_zap.ogg', damage*hit_amount, 1, -1)
+ else
+ playsound(src, "sparks", 50, 1)
+
/obj/effect/temp_visual/ratvar/ocular_warden/Initialize()
. = ..()
pixel_x = rand(-8, 8)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 55549f5fc4..b7e671b9e2 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -55,6 +55,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/// How long, in deciseconds, this staggers for, if null it will autocalculate from w_class and force. Unlike total mass this supports 0 and negatives.
var/stagger_force
+ /**
+ * Set FALSE and then checked at the end of on mob/living/attackby(), set TRUE on living/pre_attacked_by().
+ * Should it be FALSE by the end of the item/attack(), that means the item overrode the standard attack behaviour
+ * and the user still needs the delay applied. We can't be using return values since that'll stop afterattack() from being triggered.
+ */
+ var/attack_delay_done = FALSE
+ ///next_move click/attack delay of this item.
+ var/click_delay = CLICK_CD_MELEE
+
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
pass_flags = PASSTABLE
pressure_resistance = 4
@@ -132,6 +141,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
+ /* Our block parry data. Should be set in init, or something if you are using it.
+ * This won't be accessed without ITEM_CAN_BLOCK or ITEM_CAN_PARRY so do not set it unless you have to to save memory.
+ * If you decide it's a good idea to leave this unset while turning the flags on, you will runtime. Enjoy.
+ * If this is set to a path, it'll run get_block_parry_data(path). YOU MUST RUN [get_block_parry_data(this)] INSTEAD OF DIRECTLY ACCESSING!
+ */
+ var/datum/block_parry_data/block_parry_data
+
///Skills vars
//list of skill PATHS exercised when using this item. An associated bitfield can be set to indicate additional ways the skill is used by this specific item.
var/list/datum/skill/used_skills
@@ -231,9 +247,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
. += "[src] is made of cold-resistant materials."
if(resistance_flags & FIRE_PROOF)
. += "[src] is made of fire-retardant materials."
-
-
-
+
+ if(item_flags & (ITEM_CAN_BLOCK | ITEM_CAN_PARRY))
+ var/datum/block_parry_data/data = return_block_parry_datum(block_parry_data)
+ . += "[src] has the capacity to be used to block and/or parry. \[Show Stats\]"
if(!user.research_scanner)
return
@@ -395,6 +412,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
return ITALICS | REDUCE_RANGE
/obj/item/proc/dropped(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
for(var/X in actions)
var/datum/action/A = X
A.Remove(user)
@@ -407,6 +425,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
// called just as an item is picked up (loc is not yet changed)
/obj/item/proc/pickup(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user)
item_flags |= IN_INVENTORY
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 5d9c6ee267..2fbb45173b 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -154,7 +154,8 @@ RLD
icon_state = "rcd"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- custom_price = 900
+ custom_price = PRICE_ABOVE_EXPENSIVE
+ custom_premium_price = PRICE_ALMOST_ONE_GRAND
max_matter = 160
item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
has_ammobar = TRUE
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 7036a78bc4..9117df8e6b 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -187,6 +187,15 @@
if(ID_LOCKED_BANK_ACCOUNT)
registered_account = new /datum/bank_account/remote/non_transferable(pick(GLOB.redacted_strings))
+/obj/item/card/id/Destroy()
+ if(bank_support == ID_LOCKED_BANK_ACCOUNT)
+ QDEL_NULL(registered_account)
+ else
+ registered_account = null
+ if(my_store)
+ my_store.my_card = null
+ my_store = null
+ return ..()
/obj/item/card/id/vv_edit_var(var_name, var_value)
. = ..()
diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm
index c3b6c0312f..766c3d8636 100644
--- a/code/game/objects/items/chrono_eraser.dm
+++ b/code/game/objects/items/chrono_eraser.dm
@@ -65,7 +65,7 @@
. = ..()
AddElement(/datum/element/update_icon_blocker)
-/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
if(field)
field_disconnect(field)
..()
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 6ebeffe90f..bfbacb1a34 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -8,6 +8,9 @@ CIGARS
SMOKING PIPES
CHEAP LIGHTERS
ZIPPO
+ROLLING PAPER
+VAPES
+BONGS
CIGARETTE PACKETS ARE IN FANCY.DM
*/
@@ -506,7 +509,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
resistance_flags = FIRE_PROOF
light_color = LIGHT_COLOR_FIRE
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
- custom_price = 55
+ custom_price = PRICE_ALMOST_CHEAP
/obj/item/lighter/Initialize()
. = ..()
@@ -616,6 +619,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A cheap-as-free lighter."
icon_state = "lighter"
fancy = FALSE
+ custom_price = PRICE_CHEAP_AS_FREE
overlay_list = list(
"transp",
"tall",
@@ -799,6 +803,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
to_chat(user, "You need to close the cap first!")
/obj/item/clothing/mask/vape/dropped(mob/user)
+ . = ..()
var/mob/living/carbon/C = user
if(C.get_item_by_slot(SLOT_WEAR_MASK) == src)
ENABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 32c879e2d2..1b378dcfb1 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -293,6 +293,10 @@
name = "Mining Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/mining
+/obj/item/circuitboard/computer/snow_taxi
+ name = "Snow Taxi (Computer Board)"
+ build_path = /obj/machinery/computer/shuttle/snow_taxi
+
/obj/item/circuitboard/computer/white_ship
name = "White Ship (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index aa8c61ae0c..fdc3aa30af 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -1,7 +1,7 @@
/obj/item/flashlight
name = "flashlight"
desc = "A hand-held emergency light."
- custom_price = 100
+ custom_price = PRICE_REALLY_CHEAP
icon = 'icons/obj/lighting.dmi'
icon_state = "flashlight"
item_state = "flashlight"
@@ -211,6 +211,7 @@
light_color = "#CDDDFF"
flashlight_power = 0.9
hitsound = 'sound/weapons/genhit1.ogg'
+ custom_price = PRICE_ALMOST_CHEAP
// the desk lamps are a bit special
/obj/item/flashlight/lamp
@@ -351,12 +352,13 @@
brightness_on = 6 // luminosity when on
light_color = "#FFAA44"
flashlight_power = 0.8
+ custom_price = PRICE_CHEAP
/obj/item/flashlight/lantern/jade
name = "jade lantern"
desc = "An ornate, green lantern."
color = LIGHT_COLOR_GREEN
- light_color = LIGHT_COLOR_GREEN
+ light_color = LIGHT_COLOR_GREEN
/obj/item/flashlight/slime
gender = PLURAL
@@ -429,7 +431,7 @@
/obj/item/flashlight/glowstick
name = "glowstick"
desc = "A military-grade glowstick."
- custom_price = 50
+ custom_price = PRICE_CHEAP_AS_FREE
w_class = WEIGHT_CLASS_SMALL
brightness_on = 4
color = LIGHT_COLOR_GREEN
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index a7b22a4c30..28e1e1294f 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -6,12 +6,14 @@ T-RAY
HEALTH ANALYZER
GAS ANALYZER
SLIME SCANNER
+NANITE SCANNER
+GENETICS SCANNER
*/
/obj/item/t_scanner
name = "\improper T-ray scanner"
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
- custom_price = 150
+ custom_price = PRICE_REALLY_CHEAP
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
var/on = FALSE
@@ -653,9 +655,10 @@ SLIME SCANNER
amount += inaccurate
return DisplayTimeText(max(1,amount))
-/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src)
+/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src, visible = TRUE)
var/icon = target
- user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].")
+ if(visible)
+ user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].")
to_chat(user, "Results of analysis of [icon2html(icon, user)] [target].")
var/list/airs = islist(mixture) ? mixture : list(mixture)
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index a92d9221c2..a1f4994a64 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -5,7 +5,7 @@
icon_state = "scanner"
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
- custom_price = 900
+ custom_price = PRICE_ABOVE_EXPENSIVE
/obj/item/sensor_device/attack_self(mob/user)
GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 77d9f09eff..e44212ba3f 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -71,7 +71,7 @@
sharpness = IS_SHARP_ACCURATE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/bayonet = FALSE //Can this be attached to a gun?
- custom_price = 250
+ custom_price = PRICE_NORMAL
/obj/item/kitchen/knife/Initialize()
. = ..()
@@ -131,7 +131,7 @@
custom_materials = list(/datum/material/iron=18000)
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
w_class = WEIGHT_CLASS_NORMAL
- custom_price = 600
+ custom_price = PRICE_EXPENSIVE
/obj/item/kitchen/knife/combat
name = "combat knife"
@@ -200,7 +200,7 @@
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
- custom_price = 200
+ custom_price = PRICE_ALMOST_CHEAP
/obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index e4cfeab20f..63279d2ddc 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -105,9 +105,28 @@
sharpness = IS_SHARP
embedding = list("embed_chance" = 75, "embedded_impact_pain_multiplier" = 10)
armour_penetration = 35
- block_chance = 50
+ item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
+ block_parry_data = /datum/block_parry_data/energy_sword
var/list/possible_colors = list("red" = LIGHT_COLOR_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER)
+/datum/block_parry_data/energy_sword
+ parry_time_windup = 0
+ parry_time_active = 25
+ parry_time_spindown = 0
+ // we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing.
+ parry_time_windup_visual_override = 1
+ parry_time_active_visual_override = 3
+ parry_time_spindown_visual_override = 12
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK // esword users can attack while
+ parry_time_perfect = 2.5 // first ds isn't perfect
+ parry_time_perfect_leeway = 1.5
+ parry_imperfect_falloff_percent = 5
+ parry_efficiency_to_counterattack = 100
+ parry_efficiency_considered_successful = 65 // VERY generous
+ parry_efficiency_perfect = 100
+ parry_failed_stagger_duration = 4 SECONDS
+ parry_cooldown = 0.5 SECONDS
+
/obj/item/melee/transforming/energy/sword/Initialize(mapload)
. = ..()
set_sword_color()
@@ -273,6 +292,10 @@
light_color = "#37FFF7"
actions_types = list()
+/obj/item/melee/transforming/energy/sword/cx/Initialize()
+ icon_state_on = icon_state
+ return ..()
+
/obj/item/melee/transforming/energy/sword/cx/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
@@ -290,6 +313,7 @@
if(!supress_message_text)
to_chat(user, "[src] [active ? "is now active":"can now be concealed"].")
+
/obj/item/melee/transforming/energy/sword/cx/update_overlays()
. = ..()
var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 71437d4706..741607edc3 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -61,13 +61,25 @@
force = 18
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
- block_chance = 50
armour_penetration = 75
sharpness = IS_SHARP
attack_verb = list("slashed", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
total_mass = 3.4
+ item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
+ block_parry_data = /datum/block_parry_data/captain_saber
+
+/datum/block_parry_data/captain_saber
+ parry_time_windup = 0.5
+ parry_time_active = 4
+ parry_time_spindown = 1
+ parry_time_perfect = 0.75
+ parry_time_perfect_leeway = 0.75
+ parry_imperfect_falloff_percent = 30
+ parry_efficiency_perfect = 100
+ parry_failed_stagger_duration = 3 SECONDS
+ parry_failed_clickcd_duration = 2 SECONDS
/obj/item/melee/sabre/Initialize()
. = ..()
@@ -150,7 +162,6 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 15
throwforce = 25
- block_chance = 50
armour_penetration = 200 //Apparently this gives it the ability to pierce block
flags_1 = CONDUCT_1
obj_flags = UNIQUE_RENAME
@@ -159,16 +170,47 @@
attack_verb = list("stabs", "punctures", "pierces", "pokes")
hitsound = 'sound/weapons/rapierhit.ogg'
total_mass = 0.4
+ item_flags = ITEM_CAN_PARRY | NEEDS_PERMIT
+ block_parry_data = /datum/block_parry_data/traitor_rapier
+
+// Fast, efficient parry.
+/datum/block_parry_data/traitor_rapier
+ parry_time_windup = 0.5
+ parry_time_active = 5
+ parry_time_spindown = 0
+ parry_time_active_visual_override = 3
+ parry_time_spindown_visual_override = 2
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING
+ parry_time_perfect = 0
+ parry_time_perfect_leeway = 3
+ parry_time_perfect_leeway_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 1
+ )
+ parry_imperfect_falloff_percent_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 50 // useless after 3rd decisecond
+ )
+ parry_imperfect_falloff_percent = 30
+ parry_efficiency_to_counterattack = 100
+ parry_efficiency_considered_successful = 1
+ parry_efficiency_perfect = 100
+ parry_data = list(
+ PARRY_DISARM_ATTACKER = TRUE,
+ PARRY_KNOCKDOWN_ATTACKER = 10
+ )
+ parry_failed_stagger_duration = 2 SECONDS
+ parry_failed_clickcd_duration = CLICK_CD_RANGE
+ parry_cooldown = 0
+
+/obj/item/melee/rapier/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text)
+ . = ..()
+ if((attack_type & ATTACK_TYPE_PROJECTILE) && (parry_efficiency >= 100))
+ . |= BLOCK_SHOULD_REDIRECT
+ return_list[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
/obj/item/melee/rapier/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 20, 65, 0)
-/obj/item/melee/rapier/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
- if(attack_type == ATTACK_TYPE_PROJECTILE)
- final_block_chance = 0
- return ..()
-
/obj/item/melee/rapier/on_exit_storage(datum/component/storage/S)
var/obj/item/storage/belt/sabre/rapier/B = S.parent
if(istype(B))
@@ -191,10 +233,9 @@
. = ..()
if(iscarbon(target))
var/mob/living/carbon/H = target
- var/loss = H.getStaminaLoss()
H.Dizzy(10)
H.adjustStaminaLoss(30)
- if((loss > 40) && prob(loss)) // if above 40, roll for sleep using 1% every 1 stamina damage
+ if(CHECK_STAMCRIT(H) != NOT_STAMCRIT)
H.Sleeping(180)
/obj/item/melee/classic_baton
@@ -664,4 +705,4 @@
. = ..()
overlay = mutable_appearance(icon, overlay_state)
overlay.appearance_flags = RESET_COLOR
- add_overlay(overlay)
\ No newline at end of file
+ add_overlay(overlay)
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index a1652fd211..5a395c112a 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -78,7 +78,7 @@
name = "crew pinpointer"
desc = "A handheld tracking device that points to crew suit sensors."
icon_state = "pinpointer_crew"
- custom_price = 600
+ custom_price = PRICE_ABOVE_EXPENSIVE
var/has_owner = FALSE
var/pinpointer_owner = null
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index a564d7f9f9..00a9ff22f4 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -140,7 +140,8 @@
if(jsonlist["icon_state"])
icon_state = jsonlist["icon_state"]
item_state = jsonlist["item_state"]
- icon = 'config/plushies/sprites.dmi'
+ var/static/config_sprites = file("config/plushies/sprites.dmi")
+ icon = config_sprites
if(jsonlist["attack_verb"])
attack_verb = jsonlist["attack_verb"]
if(jsonlist["squeak_override"])
@@ -436,13 +437,13 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
/obj/item/toy/plush/random/Initialize()
var/newtype
var/list/snowflake_list = CONFIG_GET(keyed_list/snowflake_plushies)
-
+
/// If there are no snowflake plushies we'll default to base plush, so we grab from the valid list
if (snowflake_list.len)
newtype = prob(CONFIG_GET(number/snowflake_plushie_prob)) ? /obj/item/toy/plush/random_snowflake : pick(GLOB.valid_plushie_paths)
- else
+ else
newtype = pick(GLOB.valid_plushie_paths)
-
+
new newtype(loc)
return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm
index 648f465a22..b7e2d22d2f 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/powerfist.dm
@@ -6,6 +6,7 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
flags_1 = CONDUCT_1
+ item_flags = NEEDS_PERMIT | NO_COMBAT_MODE_FORCE_MODIFIER //To avoid ambushing and oneshotting healthy crewmembers on force setting 3.
attack_verb = list("whacked", "fisted", "power-punched")
force = 20
throwforce = 10
@@ -13,7 +14,7 @@
w_class = WEIGHT_CLASS_NORMAL
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
resistance_flags = FIRE_PROOF
- var/click_delay = 1.5
+ click_delay = CLICK_CD_MELEE * 1.5
var/fisto_setting = 1
var/gasperfist = 3
var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram.
@@ -70,42 +71,46 @@
/obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)
- if(!tank)
- to_chat(user, "\The [src] can't operate without a source of gas!")
- return
- var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
- var/turf/T = get_turf(src)
- if(!T)
- return
- T.assume_air(gasused)
- T.air_update_turf()
- if(!gasused)
- to_chat(user, "\The [src]'s tank is empty!")
- target.apply_damage((force / 5), BRUTE)
- playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
- target.visible_message("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!", \
- "[user]'s punches you!")
- return
- if(gasused.total_moles() < gasperfist * fisto_setting)
- to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!")
- playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
- target.apply_damage((force / 2), BRUTE)
- target.visible_message("[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
- "[user]'s punch strikes with force!")
- return
- target.apply_damage(force * fisto_setting, BRUTE)
- target.visible_message("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
- "You cry out in pain as [user]'s punch flings you backwards!")
- new /obj/effect/temp_visual/kinetic_blast(target.loc)
- playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
- playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, "You don't want to harm other living beings!")
+ return FALSE
+ if(!tank)
+ to_chat(user, "\The [src] can't operate without a source of gas!")
+ return FALSE
+ var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
+ var/turf/T = get_turf(src)
+ if(!T)
+ return FALSE
+ var/totalitemdamage = target.pre_attacked_by(src, user)
+ T.assume_air(gasused)
+ T.air_update_turf()
+ if(!gasused)
+ to_chat(user, "\The [src]'s tank is empty!")
+ target.apply_damage((totalitemdamage / 5), BRUTE)
+ playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
+ target.visible_message("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!", \
+ "[user]'s punches you!")
+ return
+ if(gasused.total_moles() < gasperfist * fisto_setting)
+ to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!")
+ playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
+ target.apply_damage((totalitemdamage / 2), BRUTE)
+ target.visible_message("[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
+ "[user]'s punch strikes with force!")
+ return
+ target.apply_damage(totalitemdamage * fisto_setting, BRUTE)
+ target.visible_message("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
+ "You cry out in pain as [user]'s punch flings you backwards!")
+ new /obj/effect/temp_visual/kinetic_blast(target.loc)
+ playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
+ playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
- var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+ var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+ target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
- target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
+ log_combat(user, target, "power fisted", src)
- log_combat(user, target, "power fisted", src)
-
- user.changeNext_move(CLICK_CD_MELEE * click_delay)
-
- return
+ var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT)
+ if(weight)
+ user.adjustStaminaLossBuffered(weight)
+ return TRUE
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index ba73bbc187..61a05aacd8 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -215,8 +215,9 @@
/obj/item/clothing/head/helmet/plate/crusader/prophet
name = "Prophet's Hat"
desc = "A religious-looking hat."
+ icon_state = "prophet"
mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
- flags_1 = 0
+ flags_1 = NONE
armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 70, "bio" = 50, "rad" = 50, "fire" = 60, "acid" = 60) //religion protects you from disease and radiation, honk.
worn_x_dimension = 64
worn_y_dimension = 64
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 2f697553f5..4b8728e426 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -358,6 +358,7 @@
check_amount()
/obj/item/borg/lollipop/dropped(mob/user)
+ . = ..()
check_amount()
/obj/item/borg/lollipop/proc/check_amount() //Doesn't even use processing ticks.
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index b9cde1664f..aefa5d3cc8 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -1,7 +1,8 @@
/obj/item/shield
name = "shield"
icon = 'icons/obj/shields.dmi'
- block_chance = 50
+ item_flags = ITEM_CAN_BLOCK
+ block_parry_data = /datum/block_parry_data/shield
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
/// Shield flags
var/shield_flags = SHIELD_FLAGS_DEFAULT
@@ -22,6 +23,18 @@
/// Shield bashing push distance
var/shieldbash_push_distance = 1
+/datum/block_parry_data/shield
+ block_damage_multiplier = 0.25
+ block_stamina_efficiency = 2.5
+ block_stamina_cost_per_second = 3.5
+ block_slowdown = 0
+ block_lock_attacking = FALSE
+ block_lock_sprinting = TRUE
+ block_start_delay = 1.5
+ block_damage_absorption = 5
+ block_resting_stamina_penalty_multiplier = 2
+ block_projectile_mitigation = 75
+
/obj/item/shield/examine(mob/user)
. = ..()
if(shield_flags & SHIELD_CAN_BASH)
@@ -154,6 +167,22 @@
icon_state = "shield_bash"
duration = 3
+/obj/item/shield/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+ if(ismovable(object))
+ var/atom/movable/AM = object
+ if(CHECK_BITFIELD(shield_flags, SHIELD_TRANSPARENT) && (AM.pass_flags & PASSGLASS))
+ return BLOCK_NONE
+ if(attack_type & ATTACK_TYPE_THROWN)
+ final_block_chance += 30
+ if(attack_type & ATTACK_TYPE_TACKLE)
+ final_block_chance = 100
+ . = ..()
+ if(. & BLOCK_SUCCESS)
+ on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return)
+
+/obj/item/shield/on_active_block(mob/living/owner, atom/object, damage, damage_blocked, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, override_direction)
+ on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance)
+
/obj/item/shield/riot
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
@@ -172,20 +201,7 @@
var/repair_material = /obj/item/stack/sheet/mineral/titanium
var/can_shatter = TRUE
shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_TRANSPARENT
- max_integrity = 75
-
-/obj/item/shield/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
- if(ismovable(object))
- var/atom/movable/AM = object
- if(CHECK_BITFIELD(shield_flags, SHIELD_TRANSPARENT) && (AM.pass_flags & PASSGLASS))
- return BLOCK_NONE
- if(attack_type & ATTACK_TYPE_THROWN)
- final_block_chance += 30
- if(attack_type & ATTACK_TYPE_TACKLE)
- final_block_chance = 100
- . = ..()
- if(. & BLOCK_SUCCESS)
- on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return)
+ max_integrity = 450
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton))
@@ -238,13 +254,13 @@
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 55 //Weak
+ max_integrity = 300
obj/item/shield/riot/bullet_proof
name = "bullet resistant shield"
desc = "A far more frail shield made of resistant plastics and kevlar meant to block ballistics."
armor = list("melee" = 30, "bullet" = 80, "laser" = 0, "energy" = 0, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
- max_integrity = 55 //Weaker
+ max_integrity = 300
/obj/item/shield/riot/roman
name = "\improper Roman shield"
@@ -255,13 +271,13 @@ obj/item/shield/riot/bullet_proof
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
repair_material = /obj/item/stack/sheet/mineral/wood
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 65
+ max_integrity = 250
/obj/item/shield/riot/roman/fake
desc = "Bears an inscription on the inside: \"Romanes venio domus\". It appears to be a bit flimsy."
block_chance = 0
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- max_integrity = 30
+ max_integrity = 40
/obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/grillehit.ogg', 100)
@@ -279,7 +295,7 @@ obj/item/shield/riot/bullet_proof
repair_material = /obj/item/stack/sheet/mineral/wood
block_chance = 30
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 55
+ max_integrity = 150
/obj/item/shield/riot/buckler/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/bang.ogg', 50)
@@ -297,13 +313,16 @@ obj/item/shield/riot/bullet_proof
throw_speed = 3
throw_range = 4
w_class = WEIGHT_CLASS_NORMAL
- var/active = 0
+ var/active = FALSE
/obj/item/shield/riot/tele/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(!active)
return BLOCK_NONE
return ..()
+/obj/item/shield/riot/tele/can_active_block()
+ return ..() && active
+
/obj/item/shield/riot/tele/attack_self(mob/living/user)
active = !active
icon_state = "teleriot[active]"
@@ -335,8 +354,7 @@ obj/item/shield/riot/bullet_proof
icon_state = "makeshift_shield"
custom_materials = list(/datum/material/iron = 18000)
slot_flags = null
- block_chance = 35
- max_integrity = 100 //Made of metal welded together its strong but not unkillable
+ max_integrity = 300 //Made of metal welded together its strong but not unkillable
force = 10
throwforce = 7
@@ -346,7 +364,6 @@ obj/item/shield/riot/bullet_proof
armor = list("melee" = 95, "bullet" = 95, "laser" = 75, "energy" = 60, "bomb" = 90, "bio" = 90, "rad" = 0, "fire" = 90, "acid" = 10) //Armor for the item, dosnt transfer to user
item_state = "metal"
icon_state = "metal"
- block_chance = 75 //1/4 shots will hit*
force = 16
slowdown = 2
throwforce = 15 //Massive pice of metal
@@ -357,19 +374,17 @@ obj/item/shield/riot/bullet_proof
/obj/item/shield/riot/tower/swat
name = "swat shield"
desc = "A massive, heavy shield that can block a lot of attacks, can take a lot of abuse before breaking."
- max_integrity = 175
- block_chance = 50
+ max_integrity = 250
/obj/item/shield/riot/implant
name = "telescoping shield implant"
desc = "A compact, arm-mounted telescopic shield. While nigh-indestructible when powered by a host user, it will eventually overload from damage. Recharges while inside its implant."
item_state = "metal"
icon_state = "metal"
- block_chance = 50
slowdown = 1
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 60
- obj_integrity = 60
+ max_integrity = 100
+ obj_integrity = 100
can_shatter = FALSE
item_flags = SLOWS_WHILE_IN_HAND
var/recharge_timerid
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 59a993ad96..98bf02906b 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -96,7 +96,7 @@
var/stop_bleeding = 1800
var/heal_brute = 5
self_delay = 10
- custom_price = 100
+ custom_price = PRICE_REALLY_CHEAP
/obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
if(ishuman(M))
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 6553cd2f7c..55719c2758 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -242,6 +242,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
null, \
new/datum/stack_recipe("wooden firearm body", /obj/item/weaponcrafting/improvised_parts/wooden_body, 10, time = 40), \
new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
+ new/datum/stack_recipe("pistol grip", /obj/item/weaponcrafting/improvised_parts/wooden_grip, 5, time = 40), \
new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index d687702af5..315b342ea7 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -427,3 +427,21 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_combined_w_class = INFINITY
STR.max_items = 100
+
+/obj/item/storage/bag/ammo
+ name = "ammo pouch"
+ desc = "A pouch for your ammo that goes in your pocket."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "ammopouch"
+ slot_flags = ITEM_SLOT_POCKET
+ w_class = WEIGHT_CLASS_BULKY
+ resistance_flags = FLAMMABLE
+
+/obj/item/storage/bag/ammo/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_w_class = WEIGHT_CLASS_NORMAL
+ STR.max_combined_w_class = 30
+ STR.max_items = 3
+ STR.display_numerical_stacking = FALSE
+ STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))
\ No newline at end of file
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 82ae274012..7809f6d73b 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -713,7 +713,7 @@
icon_state = "fannypack_leather"
item_state = "fannypack_leather"
dying_key = DYE_REGISTRY_FANNYPACK
- custom_price = 100
+ custom_price = PRICE_ALMOST_CHEAP
/obj/item/storage/belt/fannypack/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index c5b48164a0..41c5204bdc 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -434,6 +434,7 @@
desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes."
icon_state = "donkpocketbox"
illustration=null
+ custom_premium_price = PRICE_ABOVE_NORMAL // git gud
/obj/item/storage/box/donkpockets/ComponentInitialize()
. = ..()
@@ -622,7 +623,7 @@
item_state = "zippo"
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT
- custom_price = 20
+ custom_price = PRICE_REALLY_CHEAP
/obj/item/storage/box/matches/ComponentInitialize()
. = ..()
@@ -1343,6 +1344,7 @@
name = "box of marshmallows"
desc = "A box of marshmallows."
illustration = "marshmallow"
+ custom_premium_price = PRICE_BELOW_NORMAL
/obj/item/storage/box/marshmallow/PopulateContents()
for (var/i in 1 to 5)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 685a3b59f6..b78bd99d92 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -70,6 +70,7 @@
name = "donut box"
spawn_type = /obj/item/reagent_containers/food/snacks/donut
fancy_open = TRUE
+ custom_price = PRICE_NORMAL
/obj/item/storage/fancy/donut_box/ComponentInitialize()
. = ..()
@@ -136,7 +137,7 @@
slot_flags = ITEM_SLOT_BELT
icon_type = "cigarette"
spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
- custom_price = 75
+ custom_price = PRICE_ALMOST_CHEAP
/obj/item/storage/fancy/cigarettes/ComponentInitialize()
. = ..()
@@ -278,7 +279,7 @@
///The value in here has NOTHING to do with icons. It needs to be this for the proper examine.
icon_type = "rolling paper"
spawn_type = /obj/item/rollingpaper
- custom_price = 25
+ custom_price = PRICE_REALLY_CHEAP
/obj/item/storage/fancy/rollingpapers/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index c7c0a711c8..ba2746844c 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -432,8 +432,8 @@
throw_range = 7
var/empty = FALSE
item_state = "firstaid"
- custom_price = 300
- custom_premium_price = 500
+ custom_price = PRICE_ABOVE_NORMAL
+ custom_premium_price = PRICE_EXPENSIVE
/obj/item/storage/hypospraykit/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index e9364bcede..fa0c9ba693 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -141,7 +141,7 @@
/obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
var/interrupt = common_baton_melee(M, user, FALSE)
if(!interrupt)
- ..()
+ return ..()
/obj/item/melee/baton/alt_pre_attack(atom/A, mob/living/user, params)
. = common_baton_melee(A, user, TRUE) //return true (attackchain interrupt) if this also returns true. no harm-disarming.
@@ -154,7 +154,7 @@
if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
clowning_around(user)
if(IS_STAMCRIT(user)) //CIT CHANGE - makes it impossible to baton in stamina softcrit
- to_chat(user, "You're too exhausted for that.")
+ to_chat(user, "You're too exhausted to use [src] properly.")
return TRUE
if(ishuman(M))
var/mob/living/carbon/human/L = M
@@ -170,10 +170,12 @@
return disarming || (user.a_intent != INTENT_HARM)
/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user, disarming = FALSE)
- if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; check_shields() handles that
+ var/list/return_list = list()
+ if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, return_list) & BLOCK_SUCCESS) //No message; check_shields() handles that
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
var/stunpwr = stamforce
+ stunpwr = block_calculate_resultant_damage(stunpwr, return_list)
var/obj/item/stock_parts/cell/our_cell = get_cell()
if(!our_cell)
switch_status(FALSE)
diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm
index 8f5303da8e..b4c8d8adf0 100644
--- a/code/game/objects/items/tanks/tank_types.dm
+++ b/code/game/objects/items/tanks/tank_types.dm
@@ -93,11 +93,13 @@
F.update_icon()
else
return ..()
+//Makes empty oxygen tanks spawn without gas
+/obj/item/tank/internals/plasma/empty/populate_gas()
+ return
/obj/item/tank/internals/plasma/full/populate_gas()
air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
/*
* Plasmaman Plasma Tank
*/
@@ -130,6 +132,7 @@
air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
+//makes empty plasma tanks spawn without gas.
/obj/item/tank/internals/plasmaman/belt/empty/populate_gas()
return
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index 95712f386a..00fbc41516 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -153,6 +153,10 @@
return (BRUTELOSS)
+/obj/item/tank/attack_ghost(mob/dead/observer/O)
+ . = ..()
+ atmosanalyzer_scan(air_contents, O, src, FALSE)
+
/obj/item/tank/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/assembly_holder))
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index de5f332f43..b1c0d3dfbb 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -145,7 +145,7 @@
desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
icon_state = "waterbackpackjani"
item_state = "waterbackpackjani"
- custom_price = 1000
+ custom_price = PRICE_ALMOST_ONE_GRAND
/obj/item/watertank/janitor/Initialize()
. = ..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index bc0c1328af..cd630a2c82 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -446,6 +446,7 @@
throw_range = 5
force_unwielded = 0
force_wielded = 0
+ block_parry_data = null
attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD
sharpness = IS_BLUNT
@@ -835,11 +836,11 @@
/obj/item/toy/cards/deck/update_icon_state()
switch(cards.len)
- if(INFINITY to original_size/2)
+ if(original_size*0.5 to INFINITY)
icon_state = "deck_[deckstyle]_full"
- if(original_size/2 to original_size/4)
+ if(original_size*0.25 to original_size*0.5)
icon_state = "deck_[deckstyle]_half"
- if(original_size/4 to 1)
+ if(1 to original_size*0.25)
icon_state = "deck_[deckstyle]_low"
else
icon_state = "deck_[deckstyle]_empty"
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index acfc9a6e85..4437eefbf8 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -30,6 +30,8 @@
var/wieldsound = null
var/unwieldsound = null
var/slowdown_wielded = 0
+ /// Do we need to be wielded to actively block/parry?
+ var/requires_wield_to_block_parry = TRUE
item_flags = SLOWS_WHILE_IN_HAND
/obj/item/twohanded/proc/unwield(mob/living/carbon/user, show_message = TRUE)
@@ -90,6 +92,12 @@
user.put_in_inactive_hand(O)
set_slowdown(slowdown + slowdown_wielded)
+/obj/item/twohanded/can_active_block()
+ return ..() && (!requires_wield_to_block_parry || wielded)
+
+/obj/item/twohanded/can_active_parry()
+ return ..() && (!requires_wield_to_block_parry || wielded)
+
/obj/item/twohanded/dropped(mob/user)
. = ..()
//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
@@ -129,6 +137,7 @@
return ..()
/obj/item/twohanded/offhand/dropped(mob/living/user, show_message = TRUE) //Only utilized by dismemberment since you can't normally switch to the offhand to drop it.
+ . = ..()
var/obj/I = user.get_active_held_item()
if(I && istype(I, /obj/item/twohanded))
var/obj/item/twohanded/thw = I
@@ -274,6 +283,8 @@
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
var/w_class_on = WEIGHT_CLASS_BULKY
+ item_flags = ITEM_CAN_PARRY | SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK
+ block_parry_data = /datum/block_parry_data/dual_esword
force_unwielded = 3
force_wielded = 34
wieldsound = 'sound/weapons/saberon.ogg'
@@ -284,7 +295,6 @@
var/saber_color = "green"
light_color = "#00ff00"//green
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- block_chance = 75
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
@@ -298,6 +308,42 @@
total_mass = 0.4 //Survival flashlights typically weigh around 5 ounces.
var/total_mass_on = 3.4
+/datum/block_parry_data/dual_esword
+ block_damage_absorption = 2
+ block_damage_multiplier = 0.15
+ block_damage_multiplier_override = list(
+ ATTACK_TYPE_MELEE = 0.25
+ )
+ block_start_delay = 0 // instantaneous block
+ block_stamina_cost_per_second = 2.5
+ block_stamina_efficiency = 3
+ block_lock_sprinting = TRUE
+ // no attacking while blocking
+ block_lock_attacking = TRUE
+ block_projectile_mitigation = 75
+
+ parry_time_windup = 0
+ parry_time_active = 8
+ parry_time_spindown = 0
+ // we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing.
+ parry_time_windup_visual_override = 1
+ parry_time_active_visual_override = 3
+ parry_time_spindown_visual_override = 4
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK // esword users can attack while parrying.
+ parry_time_perfect = 2 // first ds isn't perfect
+ parry_time_perfect_leeway = 1
+ parry_imperfect_falloff_percent = 10
+ parry_efficiency_to_counterattack = 100
+ parry_efficiency_considered_successful = 25 // VERY generous
+ parry_efficiency_perfect = 90
+ parry_failed_stagger_duration = 3 SECONDS
+ parry_failed_clickcd_duration = CLICK_CD_MELEE
+
+ // more efficient vs projectiles
+ block_stamina_efficiency_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 4
+ )
+
/obj/item/twohanded/dualsaber/suicide_act(mob/living/carbon/user)
if(wielded)
user.visible_message("[user] begins spinning way too fast! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -582,7 +628,7 @@
force_wielded = 18
throwforce = 20
throw_speed = 4
- embedding = list("embedded_impact_pain_multiplier" = 3, "embed_chance" = 90)
+ embedding = list("embedded_impact_pain_multiplier" = 1.5, "embed_chance" = 65)
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -667,6 +713,7 @@
force_wielded = 19
force_unwielded = 11
throwforce = 21
+ embedding = getEmbeddingBehavior(embed_chance = 75, embedded_pain_multiplier = 1.5) //plasmaglass spears are sharper
icon_prefix = "spearplasma"
qdel(tip)
var/obj/item/twohanded/spear/S = locate() in parts_list
@@ -681,6 +728,7 @@
if(G)
explosive = G
name = "explosive lance"
+ embedding = getEmbeddingBehavior(embed_chance = 0, embedded_pain_multiplier = 1)//elances should not be embeddable
desc = "A makeshift spear with [G] attached to it."
update_icon()
@@ -847,6 +895,7 @@
return (BRUTELOSS)
/obj/item/twohanded/pitchfork/demonic/pickup(mob/living/user)
+ . = ..()
if(isliving(user) && user.mind && user.owns_soul() && !is_devil(user))
var/mob/living/U = user
U.visible_message("As [U] picks [src] up, [U]'s arms briefly catch fire.", \
@@ -1028,13 +1077,12 @@
force_wielded = 10
throwforce = 15 //if you are a madman and finish someone off with this, power to you.
throw_speed = 1
- item_flags = NO_MAT_REDEMPTION | SLOWS_WHILE_IN_HAND
- block_chance = 30
+ item_flags = NO_MAT_REDEMPTION | SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK | ITEM_CAN_PARRY
+ block_parry_data = /datum/block_parry_data/electrostaff
attack_verb = list("struck", "beaten", "thwacked", "pulped")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
var/on = FALSE
- var/can_block_projectiles = FALSE //can't block guns
var/lethal_cost = 400 //10000/400*20 = 500. decent enough?
var/lethal_damage = 20
var/lethal_stam_cost = 4
@@ -1044,6 +1092,43 @@
var/stun_status_duration = 25
var/stun_stam_cost = 3.5
+// haha security desword time /s
+/datum/block_parry_data/electrostaff
+ block_damage_absorption = 0
+ block_damage_multiplier = 1
+ can_block_attack_types = ~ATTACK_TYPE_PROJECTILE // only able to parry non projectiles
+ block_damage_multiplier_override = list(
+ TEXT_ATTACK_TYPE_MELEE = 0.5, // only useful on melee and unarmed
+ TEXT_ATTACK_TYPE_UNARMED = 0.3
+ )
+ block_start_delay = 0.5 // near instantaneous block
+ block_stamina_cost_per_second = 3
+ block_stamina_efficiency = 2 // haha this is a horrible idea
+ // more slowdown that deswords because security
+ block_slowdown = 2
+ // no attacking while blocking
+ block_lock_attacking = TRUE
+
+ parry_time_windup = 1
+ parry_time_active = 5
+ parry_time_spindown = 0
+ parry_time_spindown_visual_override = 1
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING // no attacking while parrying
+ parry_time_perfect = 0
+ parry_time_perfect_leeway = 0.5
+ parry_efficiency_perfect = 100
+ parry_imperfect_falloff_percent = 1
+ parry_imperfect_falloff_percent_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 45 // really crappy vs projectiles
+ )
+ parry_time_perfect_leeway_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 1 // extremely harsh window for projectiles
+ )
+ // not extremely punishing to fail, but no spamming the parry.
+ parry_cooldown = 2.5 SECONDS
+ parry_failed_stagger_duration = 1.5 SECONDS
+ parry_failed_clickcd_duration = 1 SECONDS
+
/obj/item/twohanded/electrostaff/Initialize(mapload)
. = ..()
if(ispath(cell))
@@ -1059,11 +1144,6 @@
var/mob/living/silicon/robot/R = loc
. = R.get_cell()
-/obj/item/twohanded/electrostaff/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
- if(!on || (!can_block_projectiles && (attack_type & ATTACK_TYPE_PROJECTILE)))
- return BLOCK_NONE
- return ..()
-
/obj/item/twohanded/electrostaff/proc/min_hitcost()
return min(stun_cost, lethal_cost)
@@ -1174,30 +1254,30 @@
/obj/item/twohanded/electrostaff/attack(mob/living/target, mob/living/user)
if(IS_STAMCRIT(user))//CIT CHANGE - makes it impossible to baton in stamina softcrit
- to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
+ to_chat(user, "You're too exhausted to use [src] properly.")//CIT CHANGE - ditto
return //CIT CHANGE - ditto
if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
clowning_around(user) //ouch!
return
if(iscyborg(target))
- ..()
- return
- if(target.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; run_block() handles that
+ return ..()
+ var/list/return_list = list()
+ if(target.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, return_list) & BLOCK_SUCCESS) //No message; run_block() handles that
playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
if(user.a_intent != INTENT_HARM)
- if(stun_act(target, user))
+ if(stun_act(target, user, null, return_list))
user.do_attack_animation(target)
user.adjustStaminaLossBuffered(stun_stam_cost)
return
- else if(!harm_act(target, user))
+ else if(!harm_act(target, user, null, return_list))
return ..() //if you can't fry them just beat them with it
else //we did harm act them
user.do_attack_animation(target)
user.adjustStaminaLossBuffered(lethal_stam_cost)
-/obj/item/twohanded/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
- var/stunforce = stun_stamdmg
+/obj/item/twohanded/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE, list/block_return = list())
+ var/stunforce = block_calculate_resultant_damage(stun_stamdmg, block_return)
if(!no_charge_and_force)
if(!on)
target.visible_message("[user] has bapped [target] with [src]. Luckily it was off.", \
@@ -1227,8 +1307,8 @@
H.forcesay(GLOB.hit_appends)
return TRUE
-/obj/item/twohanded/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
- var/lethal_force = lethal_damage
+/obj/item/twohanded/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE, list/block_return = list())
+ var/lethal_force = block_calculate_resultant_damage(lethal_damage, block_return)
if(!no_charge_and_force)
if(!on)
return FALSE //standard item attack
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 1bb4579176..b48d2a81e4 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -122,11 +122,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/claymore/highlander/pickup(mob/living/user)
+ . = ..()
to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.")
user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!")
user.ignore_slowdown(HIGHLANDER)
/obj/item/claymore/highlander/dropped(mob/living/user)
+ . = ..()
user.unignore_slowdown(HIGHLANDER)
if(!QDELETED(src))
qdel(src) //If this ever happens, it's because you lost an arm
@@ -675,7 +677,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
to_chat(user, "You easily land a critical blow on the [target].")
if(istype(target, /mob/living/))
var/mob/living/bug = target
- bug.adjustBruteLoss(-35) //What kinda mad man would go into melee with a spider?!
+ bug.adjustBruteLoss(35) //What kinda mad man would go into melee with a spider?!
else
qdel(target)
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index bd6dcb2aff..a4ee2f16e2 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -41,7 +41,7 @@ LINEN BINS
return
/obj/item/bedsheet/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/wirecutters) || I.get_sharpness())
+ if(!(flags_1 & HOLOGRAM_1) && (istype(I, /obj/item/wirecutters) || I.get_sharpness()))
var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3)
transfer_fingerprints_to(C)
C.add_fingerprint(user)
@@ -369,4 +369,4 @@ LINEN BINS
/obj/structure/bedsheetbin/color
sheet_types = list(/obj/item/bedsheet, /obj/item/bedsheet/blue, /obj/item/bedsheet/green, /obj/item/bedsheet/orange, \
/obj/item/bedsheet/purple, /obj/item/bedsheet/red, /obj/item/bedsheet/yellow, /obj/item/bedsheet/brown, \
- /obj/item/bedsheet/black)
\ No newline at end of file
+ /obj/item/bedsheet/black)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 14d32cd4fe..beb14ff48c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -51,7 +51,6 @@
new /obj/item/storage/backpack/satchel/leather/withwallet( src )
new /obj/item/instrument/piano_synth(src)
new /obj/item/radio/headset( src )
- new /obj/item/clothing/head/colour(src)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
var/obj/item/card/id/I = W.GetID()
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 86aff44e02..8c9a3636c8 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -694,15 +694,12 @@
..()
var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
if (CONFIG_GET(flag/grey_assistants))
- if(suited)
- uniform = /obj/item/clothing/under/color/grey
- else
- uniform = /obj/item/clothing/under/color/jumpskirt/grey
+ uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
else
- if(suited)
- uniform = /obj/item/clothing/under/color/random
+ if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
+ uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
else
- uniform = /obj/item/clothing/under/color/jumpskirt/random
+ uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
name = "ghost cafe costuming kit"
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index ddf7fa6bc6..5eecc6962a 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -19,6 +19,13 @@
open = round(rand(0, 1))
update_icon()
+/obj/structure/toilet/Destroy()
+ if(loc)
+ for(var/A in contents)
+ var/atom/movable/AM = A
+ AM.forceMove(loc)
+ return ..()
+
/obj/structure/toilet/attack_hand(mob/living/user)
. = ..()
if(.)
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index c7aefbe0a6..24af2ed5bd 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -185,3 +185,16 @@
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
icon = 'icons/turf/walls/hierophant_wall.dmi'
icon_state = "wall"
+
+/turf/closed/indestructible/rock/glacierrock
+ name = "unaturally hard ice wall"
+ desc = "Ice, hardened over thousands of years, you're not breaking through this."
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "snow_rock"
+
+/turf/closed/indestructible/rock/glacierrock/blue
+ name = "blue ice wall"
+ desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color."
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "ice"
+ canSmoothWith = list(/turf/closed/indestructible/rock/glacierrock/blue)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 06cd38a4c3..2f4e2e0eee 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -157,7 +157,7 @@
planetary_atmos = TRUE
floor_tile = null
initial_gas_mix = FROZEN_ATMOS
- slowdown = 2
+ slowdown = 1.5 //So digging it out paths are usefull.
bullet_sizzle = TRUE
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index df54df5c7d..bff431a6c7 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -346,7 +346,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
//print the key
if(islist(key))
recursive_list_print(output, key, datum_handler, atom_handler)
- else if(is_proper_datum(key) && (datum_handler || (isatom(key) && atom_handler)))
+ else if(is_object_datatype(key) && (datum_handler || (isatom(key) && atom_handler)))
if(isatom(key) && atom_handler)
output += atom_handler.Invoke(key)
else
@@ -360,7 +360,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/value = input[key]
if(islist(value))
recursive_list_print(output, value, datum_handler, atom_handler)
- else if(is_proper_datum(value) && (datum_handler || (isatom(value) && atom_handler)))
+ else if(is_object_datatype(value) && (datum_handler || (isatom(value) && atom_handler)))
if(isatom(value) && atom_handler)
output += atom_handler.Invoke(value)
else
@@ -498,7 +498,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
if(length(select_text))
var/text = islist(select_text)? select_text.Join() : select_text
var/static/result_offset = 0
- showmob << browse(text, "window=SDQL-result-[result_offset++]")
+ showmob << browse(text, "window=SDQL-result-[result_offset++];size=800x1200")
show_next_to_key = null
if(qdel_on_finish)
qdel(src)
@@ -646,7 +646,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
switch(query_tree[1])
if("call")
for(var/i in found)
- if(!is_proper_datum(i))
+ if(!is_object_datatype(i))
continue
world.SDQL_var(i, query_tree["call"][1], null, i, superuser, src)
obj_count_finished++
@@ -664,7 +664,10 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/list/text_list = list()
var/print_nulls = !(options & SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS)
obj_count_finished = select_refs
+ var/n = 0
for(var/i in found)
+ if(++n == 20000)
+ text_list += "TRUNCATED - 20000 OBJECT LIMIT HIT" SDQL_print(i, text_list, print_nulls) select_refs[REF(i)] = TRUE SDQL2_TICK_CHECK @@ -675,7 +678,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if("set" in query_tree) var/list/set_list = query_tree["set"] for(var/d in found) - if(!is_proper_datum(d)) + if(!is_object_datatype(d)) continue SDQL_internal_vv(d, set_list) obj_count_finished++ @@ -685,47 +688,72 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null obj_count_finished = length(obj_count_finished) state = SDQL2_STATE_SWITCHING -/datum/SDQL2_query/proc/SDQL_print(object, list/text_list, print_nulls = TRUE) - if(is_proper_datum(object)) - text_list += "[REF(object)] : [object]" - if(istype(object, /atom)) - var/atom/A = object - var/turf/T = A.loc - var/area/a - if(istype(T)) - text_list += " at [T] [ADMIN_COORDJMP(T)]" - a = T.loc - else - var/turf/final = get_turf(T) //Recursive, hopefully? - if(istype(final)) - text_list += " at [final] [ADMIN_COORDJMP(final)]" - a = final.loc +/** + * Recursively prints out an object to text list for SDQL2 output to admins, with VV links and all. + * Recursion limit: 50 + * Limit imposed by callers should be around 10000 objects + * Seriously, if you hit those limits, you're doing something wrong. + */ +/datum/SDQL2_query/proc/SDQL_print(datum/object, list/text_list, print_nulls = TRUE, recursion = 1, linebreak = TRUE) + if(recursion > 50) + text_list += "
RECURSION LIMIT REACHED.
" + return + if(is_object_datatype(object)) + if(!islist(object)) + text_list += "[object.type] [REF(object)]: [object]" + if(istype(object, /atom)) + if(istype(object, /turf)) + var/turf/T = object + text_list += " [ADMIN_COORDJMP(T)] at [T.loc]" else - text_list += " at nonexistant location" - if(a) - text_list += " in area [a]" - if(T.loc != a) - text_list += " inside [T]" - text_list += "
" - else if(islist(object)) - var/list/L = object - var/first = TRUE - text_list += "\[" - for (var/x in L) - if (!first) - text_list += ", " - first = FALSE - SDQL_print(x, text_list) - if (!isnull(x) && !isnum(x) && L[x] != null) - text_list += " -> " - SDQL_print(L[L[x]], text_list) - text_list += "]
" + var/atom/A = object + var/atom/container = A.loc + if(isturf(container)) + text_list += " in [container] [ADMIN_COORDJMP(container)] at [container.loc]" + else if(container) + var/turf/T = get_turf(container) + var/cref = REF(container) + text_list += " in [container]([cref])" + if(T) + text_list += " on [T] [ADMIN_COORDJMP(T)] at[T.loc]" + else + text_list += " in nullspace" + else // lists are snowflake and get special treatment. + text_list += "/list [REF(object)] \[
" + var/list/L = object + if(length(L)) + for(var/key in object) + if(islist(key)) + text_list += "" + SDQL_print(key, text_list, TRUE, recursion + 1, FALSE) + text_list += "" + else + SDQL_print(key, text_list, TRUE, recursion, FALSE) + if(IS_VALID_ASSOC_KEY(key) && !isnull(L[key])) + var/value = L[key] + text_list += " --> " + if(islist(value)) + text_list += "" + SDQL_print(value, text_list, TRUE, recursion + 1, FALSE) + text_list += "" + else + SDQL_print(value, text_list, TRUE, recursion, FALSE) + text_list += "
" + text_list += "\]" + if(linebreak) + text_list += "
" else if(isnull(object)) if(print_nulls) - text_list += "NULL
" + text_list += "NULL" + else if(istext(object)) + text_list += "\"[object]\"" + else if(isnum(object) || ispath(object)) + text_list += "[object]" else - text_list += "[object]
" + text_list += "UNKNOWN: [object]" + if(linebreak) + text_list += "
" /datum/SDQL2_query/CanProcCall() if(!allow_admin_interact) @@ -957,7 +985,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null var/static/list/exclude = list("usr", "src", "marked", "global") var/long = start < expression.len var/datum/D - if(is_proper_datum(object)) + if(is_object_datatype(object)) D = object if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude)) //3 == length("SS") + 1 @@ -1161,9 +1189,6 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null query_list += word return query_list -/proc/is_proper_datum(thing) - return istype(thing, /datum) || istype(thing, /client) - /obj/effect/statclick/SDQL2_delete/Click() var/datum/SDQL2_query/Q = target Q.delete_click() diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm index 5116cd5cd6..ab9f4a534c 100644 --- a/code/modules/admin/view_variables/debug_variables.dm +++ b/code/modules/admin/view_variables/debug_variables.dm @@ -16,11 +16,19 @@ header = "
| - |
|
- - |
+
|
- [items.Join()]
- [items.Join()]
Maximum 10 chants." + var/heal_attempts = 4 + var/heal_amount = 2.5 + var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) + var/static/list/heal_finish_messages = list("There, all mended!", "Try not to get too damaged.", "No more dents and scratches for you!", "Champions never die.", "All patched up.", \ + "Ah, child, it's okay now.", "Pain is temporary.", "What you do for the Justiciar is eternal.", "Bear this for me.", "Be strong, child.", "Please, be careful!", \ + "If you die, you will be remembered.") + var/static/list/heal_target_typecache = typecacheof(list( + /obj/structure/destructible/clockwork, + /obj/machinery/door/airlock/clockwork, + /obj/machinery/door/window/clockwork, + /obj/structure/window/reinforced/clockwork, + /obj/structure/table/reinforced/brass)) + var/static/list/ratvarian_armor_typecache = typecacheof(list( + /obj/item/clothing/suit/armor/clockwork, + /obj/item/clothing/head/helmet/clockwork, + /obj/item/clothing/gloves/clockwork, + /obj/item/clothing/shoes/clockwork)) + +/datum/clockwork_scripture/channeled/mending_mantra/chant_effects(chant_number) + var/turf/T + for(var/atom/movable/M in range(7, invoker)) + if(isliving(M)) + if(isclockmob(M) || istype(M, /mob/living/simple_animal/drone/cogscarab)) + var/mob/living/simple_animal/S = M + if(S.health == S.maxHealth || S.stat == DEAD) + continue + T = get_turf(M) + for(var/i in 1 to heal_attempts) + if(S.health < S.maxHealth) + S.adjustHealth(-heal_amount) + new /obj/effect/temp_visual/heal(T, "#1E8CE1") + if(i == heal_attempts && S.health >= S.maxHealth) //we finished healing on the last tick, give them the message + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else if(issilicon(M)) + var/mob/living/silicon/S = M + if(S.health == S.maxHealth || S.stat == DEAD || !is_servant_of_ratvar(S)) + continue + T = get_turf(M) + for(var/i in 1 to heal_attempts) + if(S.health < S.maxHealth) + S.heal_ordered_damage(heal_amount, damage_heal_order) + new /obj/effect/temp_visual/heal(T, "#1E8CE1") + if(i == heal_attempts && S.health >= S.maxHealth) + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.health == H.maxHealth || H.stat == DEAD || !is_servant_of_ratvar(H)) + continue + T = get_turf(M) + var/heal_ticks = 0 //one heal tick for each piece of ratvarian armor worn + var/obj/item/I = H.get_item_by_slot(SLOT_WEAR_SUIT) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + I = H.get_item_by_slot(SLOT_HEAD) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + I = H.get_item_by_slot(SLOT_GLOVES) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + I = H.get_item_by_slot(SLOT_SHOES) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + if(heal_ticks) + for(var/i in 1 to heal_ticks) + if(H.health < H.maxHealth) + H.heal_ordered_damage(heal_amount, damage_heal_order) + new /obj/effect/temp_visual/heal(T, "#1E8CE1") + if(i == heal_ticks && H.health >= H.maxHealth) + to_chat(H, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else + to_chat(H, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else if(is_type_in_typecache(M, heal_target_typecache)) + var/obj/structure/destructible/clockwork/C = M + if(C.obj_integrity == C.max_integrity || (istype(C) && !C.can_be_repaired)) + continue + T = get_turf(M) + for(var/i in 1 to heal_attempts) + if(C.obj_integrity < C.max_integrity) + C.obj_integrity = min(C.obj_integrity + 5, C.max_integrity) + C.update_icon() + new /obj/effect/temp_visual/heal(T, "#1E8CE1") + else + break + new /obj/effect/temp_visual/ratvar/mending_mantra(get_turf(invoker)) + return TRUE + +//Volt Blaster: Channeled for up to five times over ten seconds to fire up to five rays of energy at target locations. +/datum/clockwork_scripture/channeled/volt_blaster + descname = "Channeled, Targeted Energy Blasts" + name = "Volt Blaster" + desc = "Allows you to fire five energy rays at target locations. Channeled every fourth of a second for a maximum of ten seconds." + channel_time = 30 + invocations = list("Amperage...", "...grant me your power!") + chant_invocations = list("Use charge to kill!", "Slay with power!", "Hunt with energy!") + chant_amount = 5 + chant_interval = 4 + power_cost = 500 + usage_tip = "Though it requires you to stand still, this scripture can do massive damage." + tier = SCRIPTURE_SCRIPT + primary_component = BELLIGERENT_EYE + sort_priority = 5 + quickbind = TRUE + quickbind_desc = "Allows you to fire energy rays at target locations.
Maximum 5 chants." + var/static/list/nzcrentr_insults = list("You're not very good at aiming.", "You hunt badly.", "What a waste of energy.", "Almost funny to watch.", + "Boss says \"Click something, you idiot!\".", "Stop wasting power if you can't aim.") + +/datum/clockwork_scripture/channeled/volt_blaster/chant_effects(chant_number) + slab.busy = null + var/datum/clockwork_scripture/ranged_ability/volt_ray/ray = new + ray.slab = slab + ray.invoker = invoker + var/turf/T = get_turf(invoker) + if(!ray.run_scripture() && slab && invoker) + if(can_recite() && T == get_turf(invoker)) + to_chat(invoker, "\"[text2ratvar(pick(nzcrentr_insults))]\"") + else + return FALSE + return TRUE + +/obj/effect/ebeam/volt_ray + name = "volt_ray" + layer = LYING_MOB_LAYER + +/datum/clockwork_scripture/ranged_ability/volt_ray + name = "Volt Ray" + slab_overlay = "volt" + allow_mobility = FALSE + ranged_type = /obj/effect/proc_holder/slab/volt + ranged_message = "You charge the clockwork slab with shocking might.\n\ + Left-click a target to fire, quickly!" + timeout_time = 20 + +/datum/clockwork_scripture/channeled/void_volt + descname = "Channeled, Power Drain" + name = "Void Volt" + desc = "A channeled spell that quickly drains any powercells in a radius of eight tiles, but burns the invoker. \ + Can be channeled with more cultists to increase range and split the caused damage evenly over all invokers. \ + Also charges clockwork power by a small percentage of the drained power amount, which can help offset this scriptures powercost." + invocations = list("Channel their energy through my body... ", "... so it may fuel Engine!") + chant_invocations = list("Make their lights fall dark!", "They shall be powerless!", "Rob them of their power!") + chant_amount = 20 + chant_interval = 10 //100KW drain per pulse for guns / APCs / 1MW for other cells = 10 chants / 100ds / 10s to drain a charged weapon or a baton with a nonupgraded cell + channel_time = 50 + power_cost = 300 + multiple_invokers_used = TRUE + multiple_invokers_optional = TRUE + usage_tip = "It may be useful to end channelling early if the burning becomes too much to handle.." + tier = SCRIPTURE_SCRIPT + primary_component = GEIS_CAPACITOR + sort_priority = 10 + quickbind = TRUE + quickbind_desc = "Quickly drains power in an area around the invoker, causing burns proportional to the amount of energy drained.
Maximum of 20 chants." + +/datum/clockwork_scripture/channeled/void_volt/scripture_effects() + invoker.visible_message("[invoker] glows in a brilliant golden light!") + invoker.add_atom_colour("#FFD700", ADMIN_COLOUR_PRIORITY) + invoker.light_power = 2 + invoker.light_range = 4 + invoker.light_color = LIGHT_COLOR_FIRE + invoker.update_light() + return ..() + + +/datum/clockwork_scripture/channeled/void_volt/chant_effects(chant_number) + var/power_drained = 0 + var/power_mod = 0.005 //Amount of power drained (generally) is multiplied with this, and subsequently dealt in damage to the invoker, then 15 times that is added to the clockwork cult's power reserves. + var/drain_range = 8 + var/additional_chanters = 0 + var/list/chanters = list() + chanters += invoker + for(var/mob/living/L in range(1, invoker)) + if(!L.stat && is_servant_of_ratvar(L)) + additional_chanters++ + chanters += L + drain_range = min(drain_range + 2 * additional_chanters, drain_range * 2) //s u c c + for(var/t in spiral_range_turfs(drain_range, invoker)) + var/turf/T = t + for(var/M in T) + var/atom/movable/A = M + power_drained += A.power_drain(TRUE, TRUE) //Yes, this absolutely does drain weaponry. 10 pulses to drain guns / batons, though of course they can just be recharged. + new /obj/effect/temp_visual/ratvar/sigil/transgression(invoker.loc, 1 + (power_drained * power_mod)) + var/datum/effect_system/spark_spread/S = new + S.set_up(round(1 + (power_drained * power_mod), 1), 0, get_turf(invoker)) + S.start() + adjust_clockwork_power(power_drained * power_mod * 15) + for(var/mob/living/L in chanters) + L.adjustFireLoss(round(clamp(power_drained * power_mod / (1 + additional_chanters), 0, 20), 0.1)) //No you won't just immediately melt if you do this in a very power-rich area + + + return TRUE + +/datum/clockwork_scripture/channeled/void_volt/chant_end_effects() + invoker.visible_message("[invoker] stops glowing...") + invoker.remove_atom_colour(ADMIN_COLOUR_PRIORITY) + invoker.light_power = 0 + invoker.light_range = 0 + invoker.update_light() + return ..() diff --git a/code/modules/antagonists/clockcult/clock_structure.dm b/code/modules/antagonists/clockcult/clock_structure.dm index 13da9c5a42..2464015b6b 100644 --- a/code/modules/antagonists/clockcult/clock_structure.dm +++ b/code/modules/antagonists/clockcult/clock_structure.dm @@ -101,7 +101,7 @@ return 1 return ..() -/obj/structure/destructible/clockwork/attacked_by(obj/item/I, mob/living/user) +/obj/structure/destructible/clockwork/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) if(is_servant_of_ratvar(user) && immune_to_servant_attacks) return FALSE return ..() diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 28d1a66e00..52ead9a1e7 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -343,7 +343,7 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "disintegrate" item_state = null - item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL | NO_ATTACK_CHAIN_SOFT_STAMCRIT + item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL w_class = WEIGHT_CLASS_HUGE throwforce = 0 diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index ffab8174e5..8f0f9a658c 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -273,6 +273,7 @@ knockdown = 20 /obj/item/restraints/legcuffs/bola/cult/pickup(mob/living/user) + . = ..() if(!iscultist(user)) to_chat(user, "The bola seems to take on a life of its own!") ensnare(user) diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index 1b245b5a01..7d7031dad4 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -116,24 +116,11 @@ /mob/living/carbon/true_devil/get_ear_protection() return 2 - -/mob/living/carbon/true_devil/attacked_by(obj/item/I, mob/living/user, def_zone) - var/weakness = check_weakness(I, user) - apply_damage(I.force * weakness, I.damtype, def_zone) - var/message_verb = "" - if(I.attack_verb && I.attack_verb.len) - message_verb = "[pick(I.attack_verb)]" - else if(I.force) - message_verb = "attacked" - - var/attack_message = "[src] has been [message_verb] with [I]." - if(user) - user.do_attack_animation(src) - if(user in viewers(src, null)) - attack_message = "[user] has [message_verb] [src] with [I]!" - if(message_verb) - visible_message("[attack_message]", - "[attack_message]", null, COMBAT_MESSAGE_RANGE) +/mob/living/carbon/true_devil/attacked_by(obj/item/I, mob/living/user, def_zone, attackchain_flags = NONE, damage_multiplier = 1) + var/totitemdamage = pre_attacked_by(I, user) + totitemdamage *= check_weakness(I, user) + apply_damage(totitemdamage, I.damtype, def_zone) + send_item_attack_message(I, user, null, totitemdamage) return TRUE /mob/living/carbon/true_devil/singularity_act() diff --git a/code/modules/antagonists/traitor/classes/hijack.dm b/code/modules/antagonists/traitor/classes/hijack.dm index dbfa78eb96..bbfb0cb11d 100644 --- a/code/modules/antagonists/traitor/classes/hijack.dm +++ b/code/modules/antagonists/traitor/classes/hijack.dm @@ -4,6 +4,7 @@ weight = 3 chaos = 5 threat = 3 + min_players = 25 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit) /datum/traitor_class/human/hijack/forge_objectives(datum/antagonist/traitor/T) diff --git a/code/modules/antagonists/traitor/classes/martyr.dm b/code/modules/antagonists/traitor/classes/martyr.dm index 72f9ac86fc..5c407b70fd 100644 --- a/code/modules/antagonists/traitor/classes/martyr.dm +++ b/code/modules/antagonists/traitor/classes/martyr.dm @@ -4,6 +4,7 @@ weight = 2 chaos = 5 threat = 5 + min_players = 20 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit,/datum/uplink_item/bundles_TC/contract_kit) /datum/traitor_class/human/martyr/forge_objectives(datum/antagonist/traitor/T) diff --git a/code/modules/antagonists/traitor/classes/traitor_class.dm b/code/modules/antagonists/traitor/classes/traitor_class.dm index 260e978bec..568619f59d 100644 --- a/code/modules/antagonists/traitor/classes/traitor_class.dm +++ b/code/modules/antagonists/traitor/classes/traitor_class.dm @@ -7,6 +7,8 @@ GLOBAL_LIST_EMPTY(traitor_classes) var/chaos = 0 var/threat = 0 var/TC = 20 + /// Minimum players for this to randomly roll via get_random_traitor_class(). + var/min_players = 0 var/list/uplink_filters /datum/traitor_class/New() @@ -41,4 +43,4 @@ GLOBAL_LIST_EMPTY(traitor_classes) /datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T) // Any effects that need to be cleaned up if traitor class is being swapped. - \ No newline at end of file + diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 4422f2f174..0309b7e826 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -47,6 +47,8 @@ for(var/C in GLOB.traitor_classes) if(!(C in blacklist)) var/datum/traitor_class/class = GLOB.traitor_classes[C] + if(class.min_players > length(GLOB.joined_player_list)) + continue var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0) weights[C] = weight * 1000 var/choice = pickweight(weights, 0) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 733c760855..b47f45b42d 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -36,7 +36,7 @@ /obj/item/electronics/airalarm name = "air alarm electronics" icon_state = "airalarm_electronics" - custom_price = 50 + custom_price = PRICE_CHEAP /obj/item/wallframe/airalarm name = "air alarm frame" diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index c229a4ba27..33fd160b1a 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -162,6 +162,9 @@ to_chat(user, "Access denied.") return UI_CLOSE +/obj/machinery/atmospherics/components/attack_ghost(mob/dead/observer/O) + . = ..() + atmosanalyzer_scan(airs, O, src, FALSE) // Tool acts diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index c466a422b2..4a6170c251 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -111,3 +111,10 @@ pipe_color = paint_color update_node_icon() return TRUE + +/obj/machinery/atmospherics/pipe/attack_ghost(mob/dead/observer/O) + . = ..() + if(parent) + atmosanalyzer_scan(parent.air, O, src, FALSE) + else + to_chat(O, "[src] doesn't have a pipenet, which is probably a bug.") diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 8bf0554070..952db8315a 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -147,10 +147,14 @@ /obj/machinery/portable_atmospherics/analyzer_act(mob/living/user, obj/item/I) atmosanalyzer_scan(air_contents, user, src) -/obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user) +/obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user, attackchain_flags = NONE, damage_multiplier = 1) if(I.force < 10 && !(stat & BROKEN)) take_damage(0) else investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS) add_fingerprint(user) ..() + +/obj/machinery/portable_atmospherics/attack_ghost(mob/dead/observer/O) + . = ..() + atmosanalyzer_scan(air_contents, O, src, FALSE) diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index c7a5e59046..2b93a25a61 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -171,10 +171,10 @@ var/worth = 10 var/gases = C.air_contents.gases - worth += gases[/datum/gas/bz]*4 + worth += gases[/datum/gas/bz]*3 worth += gases[/datum/gas/stimulum]*25 worth += gases[/datum/gas/hypernoblium]*1000 - worth += gases[/datum/gas/miasma]*4 + worth += gases[/datum/gas/miasma]*2 worth += gases[/datum/gas/tritium]*7 worth += gases[/datum/gas/pluoxium]*6 worth += gases[/datum/gas/nitryl]*30 diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index dab8cad5b6..c181d6fb74 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -71,7 +71,8 @@ /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/neck/necklace/dope, /obj/item/vending_refill/donksoft, - /obj/item/circuitboard/computer/arcade/amputation) + /obj/item/circuitboard/computer/arcade/amputation, + /obj/item/storage/bag/ammo) crate_name = "crate" /datum/supply_pack/costumes_toys/foamforce diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 942720dd6b..0c7c63f867 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -66,6 +66,16 @@ crate_name = "shaft miner starter kit" crate_type = /obj/structure/closet/crate/secure +/datum/supply_pack/service/snowmobile + name = "Snowmobile kit" + desc = "trapped on a frigid wasteland? need to get around fast? purchase a refurbished snowmobile, with a FREE 10 microsecond warranty!" + cost = 1500 // 1000 points cheaper than ATV + contains = list(/obj/vehicle/ridden/atv/snowmobile = 1, + /obj/item/key = 1, + /obj/item/clothing/mask/gas/explorer = 1) + crate_name = "Snowmobile kit" + crate_type = /obj/structure/closet/crate/large + ////////////////////////////////////////////////////////////////////////////// /////////////////////// Chef, Botanist, Bartender //////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 7d87a82afb..0402dc683f 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -133,3 +133,6 @@ var/parallax_movedir = 0 var/parallax_layers_max = 3 var/parallax_animate_timer + + //world.time of when the crew manifest can be accessed + var/crew_manifest_delay diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 040b56f124..347a77059a 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -50,6 +50,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// Custom Keybindings var/list/key_bindings = list() + /// List with a key string associated to a list of keybindings. Unlike key_bindings, this one operates on raw key, allowing for binding a key that triggers regardless of if a modifier is depressed as long as the raw key is sent. + var/list/modless_key_bindings = list() var/tgui_fancy = TRUE @@ -154,6 +156,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", + "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, @@ -367,6 +370,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[features["flavor_text"]]" else dat += "[TextPreview(features["flavor_text"])]...
" + dat += "
Silicon Flavor Text
" + dat += "Set Silicon Examine Text" + if(length(features["silicon_flavor_text"]) <= 40) + if(!length(features["silicon_flavor_text"])) + dat += "\[...\]" + else + dat += "[features["silicon_flavor_text"]]" + else + dat += "[TextPreview(features["silicon_flavor_text"])]...
" dat += "
OOC notes
" dat += "Set OOC notes" var/ooc_notes_len = length(features["ooc_notes"]) @@ -1088,11 +1100,16 @@ GLOBAL_LIST_EMPTY(preferences_datums) Input mode is the closest thing to the old input system.
\ IMPORTANT: While in input mode's non hotkey setting (tab toggled), Ctrl + KEY will send KEY to the keybind system as the key itself, not as Ctrl + KEY. This means Ctrl + T/W/A/S/D/all your familiar stuff still works, but you \ won't be able to access any regular Ctrl binds.
" + dat += "
Modifier-Independent binding - This is a singular bind that works regardless of if Ctrl/Shift/Alt are held down. For example, if combat mode is bound to C in modifier-independent binds, it'll trigger regardless of if you are \ + holding down shift for sprint. Each keybind can only have one independent binding, and each key can only have one keybind independently bound to it." // Create an inverted list of keybindings -> key var/list/user_binds = list() + var/list/user_modless_binds = list() for (var/key in key_bindings) for(var/kb_name in key_bindings[key]) user_binds[kb_name] += list(key) + for (var/key in modless_key_bindings) + user_modless_binds[modless_key_bindings[key]] = key var/list/kb_categories = list() // Group keybinds by category @@ -1100,21 +1117,29 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/datum/keybinding/kb = GLOB.keybindings_by_name[name] kb_categories[kb.category] += list(kb) - dat += "" + dat += {" + + "} for (var/category in kb_categories) dat += "
[category]
" for (var/i in kb_categories[category]) var/datum/keybinding/kb = i + var/current_independent_binding = user_modless_binds[kb.name] || "Unbound" if(!length(user_binds[kb.name])) - dat += " Unbound" + dat += "[kb.full_name]Unbound" var/list/default_keys = hotkeys ? kb.hotkey_keys : kb.classic_keys if(LAZYLEN(default_keys)) dat += "| Default: [default_keys.Join(", ")]" + dat += "Independent Binding: [current_independent_binding]" dat += "" else var/bound_key = user_binds[kb.name][1] - dat += " [bound_key]" + dat += "[kb.full_name][bound_key]" for(var/bound_key_index in 2 to length(user_binds[kb.name])) bound_key = user_binds[kb.name][bound_key_index] dat += " | [bound_key]" @@ -1123,6 +1148,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/default_keys = hotkeys ? kb.classic_keys : kb.hotkey_keys if(LAZYLEN(default_keys)) dat += "| Default: [default_keys.Join(", ")]" + dat += "Independent Binding: [current_independent_binding]" dat += "
" dat += "
" @@ -1148,7 +1174,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) #undef APPEARANCE_CATEGORY_COLUMN #undef MAX_MUTANT_ROWS -/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, var/old_key) +/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, old_key, independent = FALSE) var/HTML = {"
Keybinding: [kb.full_name]
[kb.description]
Press any key to change
Press ESC to clear
[kb.description]
Press any key to change
Press ESC to clear