" + . += " ([ticket_href("REJT", ref_src, "reject")])" + . += " ([ticket_href("IC", ref_src, "icissue")])" + . += " ([ticket_href("SKILL", ref_src, "skillissue")])" + . += " ([ticket_href("CLOSE", ref_src, "close")])" + . += " ([ticket_href("RSLVE", ref_src, "resolve")])" + . += " ([ticket_href("CLAIM", ref_src, "claim")])" //private -/datum/admin_help/proc/LinkedReplyName(ref_src) +/datum/admin_help/proc/linked_reply_name(ref_src) if(!ref_src) ref_src = "[REF(src)]" return "[initiator_key_name]" //private -/datum/admin_help/proc/TicketHref(msg, ref_src, action = "ticket") +/datum/admin_help/proc/ticket_href(msg, ref_src, action = "ticket") if(!ref_src) ref_src = "[REF(src)]" return "[msg]" //message from the initiator without a target, all admins will see this //won't bug irc/discord -/datum/admin_help/proc/MessageNoRecipient(msg) +/datum/admin_help/proc/message_no_recipient(msg) var/ref_src = "[REF(src)]" //Message to be sent to all admins - var/admin_msg = "Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]" + var/admin_msg = "Ticket [ticket_href("#[id]", ref_src)]: [linked_reply_name(ref_src)] [full_monty(ref_src)]: [keywords_lookup(msg)]" - AddInteraction("[LinkedReplyName(ref_src)]: [msg]") + add_interaction("[linked_reply_name(ref_src)]: [msg]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [msg]") //send this msg to all admins @@ -299,19 +308,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) type = MESSAGE_TYPE_ADMINPM, html = "PM to-Admins: [msg]", confidential = TRUE) - SSblackbox.LogAhelp(id, "Ticket Opened", msg, null, initiator.ckey) + SSblackbox.log_ahelp(id, "Ticket Opened", msg, null, initiator.ckey) //Reopen a closed ticket -/datum/admin_help/proc/Reopen() +/datum/admin_help/proc/reopen() if(state == AHELP_ACTIVE) to_chat(usr, "This ticket is already open.", confidential = TRUE) return - if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey)) + if(GLOB.ahelp_tickets.ckey2active_ticket(initiator_ckey)) to_chat(usr, "This user already has an active ticket, cannot reopen this one.", confidential = TRUE) return - statclick = new(null, src) GLOB.ahelp_tickets.active_tickets += src GLOB.ahelp_tickets.closed_tickets -= src GLOB.ahelp_tickets.resolved_tickets -= src @@ -325,61 +333,91 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(initiator) initiator.current_ticket = src - AddInteraction("Reopened by [key_name_admin(usr)]") - var/msg = "Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)]." + add_interaction("Reopened by [key_name_admin(usr)]") + var/msg = "Ticket [ticket_href("#[id]")] reopened by [key_name_admin(usr)]." message_admins(msg) log_admin_private(msg) - SSblackbox.LogAhelp(id, "Reopened", "Reopened by [usr.key]", usr.ckey) + SSblackbox.log_ahelp(id, "Reopened", "Reopened by [usr.key]", usr.ckey) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "reopened") - TicketPanel() //can only be done from here, so refresh it + ticket_panel() //can only be done from here, so refresh it //private -/datum/admin_help/proc/RemoveActive() +/datum/admin_help/proc/remove_active() if(state != AHELP_ACTIVE) stack_trace("Attempt to remove non-active ticket") return closed_at = world.time - QDEL_NULL(statclick) GLOB.ahelp_tickets.active_tickets -= src if(initiator && initiator.current_ticket == src) initiator.current_ticket = null + SEND_SIGNAL(src, COMSIG_ADMIN_HELP_MADE_INACTIVE) + +/datum/admin_help/proc/claim(key_name = key_name_admin(usr)) + if(state != AHELP_ACTIVE) + return FALSE + if(claimed_by && claimed_by != usr.key && alert(usr, "Ticket #[id] already claimed by [claimed_by]. Override?", "Adminhelp", "Yes", "No") != "Yes") + return FALSE + if(claimed_by == usr.key) + return TRUE + add_interaction(span_grey("Claimed by [key_name].")) + to_chat(initiator, span_adminhelp("Your ticket has been claimed by an admin. Expect a response shortly."), confidential = TRUE) + claimed_by = usr.key + SSblackbox.record_feedback("tally", "ahelp_stats", 1, "claimed") + var/msg = "Ticket [ticket_href("#[id]")] claimed by [key_name]." + message_admins(msg) + SSblackbox.log_ahelp(id, "Claimed", "Claimed by [usr.key]", null, usr.ckey) + log_admin_private(msg) + return TRUE + +/datum/admin_help/proc/unclaim(key_name = key_name_admin(usr)) + if(state != AHELP_ACTIVE) + return + if(claimed_by != usr.key) + return + add_interaction(span_grey("Unclaimed by [key_name].")) + claimed_by = null + SSblackbox.record_feedback("tally", "ahelp_stats", 1, "unclaimed") + var/msg = "Ticket [ticket_href("#[id]")] unclaimed by [key_name]." + message_admins(msg) + SSblackbox.log_ahelp(id, "Unclaimed", "Unclaimed by [usr.key]", null, usr.ckey) + log_admin_private(msg) //Mark open ticket as closed/meme -/datum/admin_help/proc/Close(key_name = key_name_admin(usr), silent = FALSE) +/datum/admin_help/proc/close(key_name = key_name_admin(usr), silent = FALSE) if(state != AHELP_ACTIVE) return - RemoveActive() + remove_active() state = AHELP_CLOSED - GLOB.ahelp_tickets.ListInsert(src) - AddInteraction("Closed by [key_name].") + GLOB.ahelp_tickets.list_insert(src) + add_interaction("Closed by [key_name].") if(!silent) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "closed") - var/msg = "Ticket [TicketHref("#[id]")] closed by [key_name]." + var/msg = "Ticket [ticket_href("#[id]")] closed by [key_name]." message_admins(msg) - SSblackbox.LogAhelp(id, "Closed", "Closed by [usr.key]", null, usr.ckey) + SSblackbox.log_ahelp(id, "Closed", "Closed by [usr.key]", null, usr.ckey) log_admin_private(msg) //Mark open ticket as resolved/legitimate, returns ahelp verb -/datum/admin_help/proc/Resolve(key_name = key_name_admin(usr), silent = FALSE) +/datum/admin_help/proc/resolve(key_name = key_name_admin(usr), silent = FALSE) if(state != AHELP_ACTIVE) return - RemoveActive() + remove_active() state = AHELP_RESOLVED - GLOB.ahelp_tickets.ListInsert(src) + GLOB.ahelp_tickets.list_insert(src) addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50) - AddInteraction("Resolved by [key_name].") + add_interaction("Resolved by [key_name].") to_chat(initiator, "Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.", confidential = TRUE) if(!silent) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "resolved") - var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]" + var/msg = "Ticket [ticket_href("#[id]")] resolved by [key_name]" message_admins(msg) - SSblackbox.LogAhelp(id, "Resolved", "Resolved by [usr.key]", null, usr.ckey) + SSblackbox.log_ahelp(id, "Resolved", "Resolved by [usr.key]", null, usr.ckey) log_admin_private(msg) //Close and return ahelp verb, use if ticket is incoherent -/datum/admin_help/proc/Reject(key_name = key_name_admin(usr)) +/datum/admin_help/proc/reject(key_name = key_name_admin(usr)) if(state != AHELP_ACTIVE) return @@ -393,15 +431,15 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(initiator, "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting.", confidential = TRUE) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "rejected") - var/msg = "Ticket [TicketHref("#[id]")] rejected by [key_name]" + var/msg = "Ticket [ticket_href("#[id]")] rejected by [key_name]" message_admins(msg) log_admin_private(msg) - AddInteraction("Rejected by [key_name].") - SSblackbox.LogAhelp(id, "Rejected", "Rejected by [usr.key]", null, usr.ckey) - Close(silent = TRUE) + add_interaction("Rejected by [key_name].") + SSblackbox.log_ahelp(id, "Rejected", "Rejected by [usr.key]", null, usr.ckey) + close(silent = TRUE) //Resolve ticket with IC Issue message -/datum/admin_help/proc/ICIssue(key_name = key_name_admin(usr)) +/datum/admin_help/proc/ic_issue(key_name = key_name_admin(usr)) if(state != AHELP_ACTIVE) return @@ -412,15 +450,15 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(initiator, msg, confidential = TRUE) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "IC") - msg = "Ticket [TicketHref("#[id]")] marked as IC by [key_name]" + msg = "Ticket [ticket_href("#[id]")] marked as IC by [key_name]" message_admins(msg) log_admin_private(msg) - AddInteraction("Marked as IC issue by [key_name]") - SSblackbox.LogAhelp(id, "IC Issue", "Marked as IC issue by [usr.key]", null, usr.ckey) - Resolve(silent = TRUE) + add_interaction("Marked as IC issue by [key_name]") + SSblackbox.log_ahelp(id, "IC Issue", "Marked as IC issue by [usr.key]", null, usr.ckey) + resolve(silent = TRUE) //Resolve ticket and inform user that they have a skill issue -/datum/admin_help/proc/SkillIssue(key_name = key_name_admin(usr)) +/datum/admin_help/proc/skill_issue(key_name = key_name_admin(usr)) if(state != AHELP_ACTIVE) return @@ -431,18 +469,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(initiator, msg, confidential = TRUE) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "Skill") - msg = "Ticket [TicketHref("#[id]")] marked as skill issue by [key_name]" + msg = "Ticket [ticket_href("#[id]")] marked as skill issue by [key_name]" message_admins(msg) log_admin_private(msg) - AddInteraction("Marked as skill issue by [key_name]") - SSblackbox.LogAhelp(id, "Skill Issue", "Marked as skill issue by [usr.key]", null, usr.ckey) - Resolve(silent = TRUE) + add_interaction("Marked as skill issue by [key_name]") + SSblackbox.log_ahelp(id, "Skill Issue", "Marked as skill issue by [usr.key]", null, usr.ckey) + resolve(silent = TRUE) //Show the ticket panel -/datum/admin_help/proc/TicketPanel() - var/list/dat = list("
Admin Help Ticket #[id]: [LinkedReplyName(ref_src)]
" + dat += "Admin Help Ticket #[id]: [linked_reply_name(ref_src)] (Claimed by [claimed_by || "nobody"])
" dat += "State: " switch(state) if(AHELP_ACTIVE) @@ -453,55 +491,64 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) dat += "CLOSED" else dat += "UNKNOWN" - dat += "[FOURSPACES][TicketHref("Refresh", ref_src)][FOURSPACES][TicketHref("Re-Title", ref_src, "retitle")]" + dat += "[FOURSPACES][ticket_href("Refresh", ref_src)][FOURSPACES][ticket_href("Re-Title", ref_src, "retitle")]" if(state != AHELP_ACTIVE) - dat += "[FOURSPACES][TicketHref("Reopen", ref_src, "reopen")]" + dat += "[FOURSPACES][ticket_href("Reopen", ref_src, "reopen")]" dat += "Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" if(closed_at) dat += "
Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" dat += "
" if(initiator) - dat += "Actions: [FullMonty(ref_src)]
" + dat += "Actions:
[full_monty(ref_src)]
" else - dat += "DISCONNECTED[FOURSPACES][ClosureLinks(ref_src)]
" + dat += "DISCONNECTED[ticket_actions(ref_src)]
" dat += "
Log:
" for(var/I in _interactions) dat += "[I]
" - usr << browse(dat.Join(), "window=ahelp[id];size=620x480") + var/datum/browser/popup = new(usr, "ahelp[id]", "Ticket #[id]", 620, 480) + popup.set_content(dat.Join()) + popup.open() -/datum/admin_help/proc/Retitle() +/datum/admin_help/proc/retitle() var/new_title = input(usr, "Enter a title for the ticket", "Rename Ticket", name) as text|null if(new_title) name = new_title //not saying the original name cause it could be a long ass message - var/msg = "Ticket [TicketHref("#[id]")] titled [name] by [key_name_admin(usr)]" + var/msg = "Ticket [ticket_href("#[id]")] titled [name] by [key_name_admin(usr)]" message_admins(msg) log_admin_private(msg) - TicketPanel() //we have to be here to do this + ticket_panel() //we have to be here to do this //Forwarded action from admin/Topic -/datum/admin_help/proc/Action(action) +/datum/admin_help/proc/action(mob/user, action) testing("Ahelp action: [action]") switch(action) + if("claim") + if(user.key == claimed_by) + unclaim() + return + claim() if("ticket") - TicketPanel() + ticket_panel() if("retitle") - Retitle() + retitle() if("reject") - Reject() + reject() if("reply") - usr.client.cmd_ahelp_reply(initiator) + if(!claim()) + return + user.client.cmd_ahelp_reply(initiator) if("icissue") - ICIssue() + ic_issue() if("skillissue") - SkillIssue() + skill_issue() if("close") - Close() + close() if("resolve") - Resolve() + resolve() if("reopen") - Reopen() + reopen() // // TICKET STATCLICK @@ -518,7 +565,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) return ..(ahelp_datum.name) /obj/effect/statclick/ahelp/Click() - ahelp_datum.TicketPanel() + ahelp_datum.ticket_panel() /obj/effect/statclick/ahelp/Destroy() ahelp_datum = null @@ -562,14 +609,14 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(current_ticket) if(alert(usr, "You already have a ticket open. Is this for the same issue?",,"Yes","No") != "No") if(current_ticket) - current_ticket.MessageNoRecipient(msg) - current_ticket.TimeoutVerb() + current_ticket.message_no_recipient(msg) + current_ticket.timeout_verb() return else to_chat(usr, "Ticket not found, creating new one...", confidential = TRUE) else - current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.") - current_ticket.Close() + current_ticket.add_interaction("[key_name_admin(usr)] opened a new ticket.") + current_ticket.close() //Extremely simple system of suggesting mentorhelp instead of adminhelp var/msg_lower = lowertext(msg) @@ -594,12 +641,12 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) else C = what if(istype(C) && C.current_ticket) - C.current_ticket.AddInteraction(message) + C.current_ticket.add_interaction(message) return C.current_ticket if(istext(what)) //ckey - var/datum/admin_help/AH = GLOB.ahelp_tickets.CKey2ActiveTicket(what) + var/datum/admin_help/AH = GLOB.ahelp_tickets.ckey2active_ticket(what) if(AH) - AH.AddInteraction(message) + AH.add_interaction(message) return AH // @@ -638,8 +685,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /proc/send2tgs(msg,msg2) - msg = replacetext(replacetext(msg, "\proper", ""), "\improper", "") - msg2 = replacetext(replacetext(msg2, "\proper", ""), "\improper", "") + msg = format_text(msg) + msg2 = format_text(msg2) world.TgsTargetedChatBroadcast("[msg] | [msg2]", TRUE) /** @@ -772,3 +819,75 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) return founds return msg + +/** + * Checks a given message to see if any of the words are something we want to treat specially, as detailed below. + * + * There are 3 cases where a word is something we want to act on + * 1. Admin pings, like @adminckey. Pings the admin in question, text is not clickable + * 2. Datum refs, like @0x2001169 or @mob_23. Clicking on the link opens up the VV for that datum + * 3. Ticket refs, like #3. Displays the status and ahelper in the link, clicking on it brings up the ticket panel for it. + * Returns a list being used as a tuple. Index ASAY_LINK_NEW_MESSAGE_INDEX contains the new message text (with clickable links and such) + * while index ASAY_LINK_PINGED_ADMINS_INDEX contains a list of pinged admin clients, if there are any. + * + * Arguments: + * * msg - the message being scanned + */ +/proc/check_asay_links(msg) + var/list/msglist = splittext(msg, " ") //explode the input msg into a list + var/list/pinged_admins = list() // if we ping any admins, store them here so we can ping them after + var/modified = FALSE // did we find anything? + + var/i = 0 + for(var/word in msglist) + i++ + if(!length(word)) + continue + + switch(word[1]) + if("@") + var/stripped_word = ckey(copytext(word, 2)) + + // first we check if it's a ckey of an admin + var/client/client_check = GLOB.directory[stripped_word] + if(client_check?.holder) + msglist[i] = "[word]" + pinged_admins[stripped_word] = client_check + modified = TRUE + continue + + // then if not, we check if it's a datum ref + + var/word_with_brackets = "\[[stripped_word]\]" // the actual memory address lookups need the bracket wraps + var/datum/datum_check = locate(word_with_brackets) + if(!istype(datum_check)) + continue + msglist[i] = "[word]" + modified = TRUE + + if("#") // check if we're linking a ticket + var/possible_ticket_id = text2num(copytext(word, 2)) + if(!possible_ticket_id) + continue + + var/datum/admin_help/ahelp_check = GLOB.ahelp_tickets?.ticket_by_id(possible_ticket_id) + if(!ahelp_check) + continue + + var/state_word + switch(ahelp_check.state) + if(AHELP_ACTIVE) + state_word = "Active" + if(AHELP_CLOSED) + state_word = "Closed" + if(AHELP_RESOLVED) + state_word = "Resolved" + + msglist[i]= "[word] ([state_word] | [ahelp_check.initiator_key_name])" + modified = TRUE + + if(modified) + var/list/return_list = list() + return_list[ASAY_LINK_NEW_MESSAGE_INDEX] = jointext(msglist, " ") // without tuples, we must make do! + return_list[ASAY_LINK_PINGED_ADMINS_INDEX] = pinged_admins + return return_list diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index b4e5653b0076..d227d44e18b0 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -82,7 +82,7 @@ type = MESSAGE_TYPE_ADMINPM, html = "Message not sent:
[msg]", confidential = TRUE) - AH.AddInteraction("No client found, message not sent:
[msg]") + AH.add_interaction("No client found, message not sent:
[msg]") return cmd_admin_pm(whom, msg) @@ -169,10 +169,10 @@ html = "Message not sent:
[msg]", confidential = TRUE) if(recipient_ticket) - recipient_ticket.AddInteraction("No client found, message not sent:
[msg]") + recipient_ticket.add_interaction("No client found, message not sent:
[msg]") return else - current_ticket.MessageNoRecipient(msg) + current_ticket.message_no_recipient(msg) return @@ -212,6 +212,8 @@ if(holder && recipient.holder && !current_ticket) //Both are admins, and this is not a reply to our own ticket. badmin = TRUE if(recipient.holder && !badmin) + SEND_SIGNAL(current_ticket, COMSIG_ADMIN_HELP_REPLIED) + if(holder) to_chat(recipient, type = MESSAGE_TYPE_ADMINPM, @@ -226,7 +228,7 @@ admin_ticket_log(src, interaction_message) if(recipient != src) //reeee admin_ticket_log(recipient, interaction_message) - SSblackbox.LogAhelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey) + SSblackbox.log_ahelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey) else //recipient is an admin but sender is not var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]" admin_ticket_log(src, "[replymsg]") @@ -238,19 +240,18 @@ type = MESSAGE_TYPE_ADMINPM, html = "PM to-Admins: [msg]", confidential = TRUE) - SSblackbox.LogAhelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey) + SSblackbox.log_ahelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey) //play the receiving admin the adminhelp sound (if they have them enabled) if(recipient.prefs.toggles & SOUND_ADMINHELP) SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) - else if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT var/already_logged = FALSE if(!recipient.current_ticket) new /datum/admin_help(msg, recipient, TRUE) already_logged = TRUE - SSblackbox.LogAhelp(recipient.current_ticket.id, "Ticket Opened", msg, recipient.ckey, src.ckey) + SSblackbox.log_ahelp(recipient.current_ticket.id, "Ticket Opened", msg, recipient.ckey, src.ckey) to_chat(recipient, type = MESSAGE_TYPE_ADMINPM, @@ -272,21 +273,23 @@ admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") if(!already_logged) //Reply to an existing ticket - SSblackbox.LogAhelp(recipient.current_ticket.id, "Reply", msg, recipient.ckey, src.ckey) + SSblackbox.log_ahelp(recipient.current_ticket.id, "Reply", msg, recipient.ckey, src.ckey) //always play non-admin recipients the adminhelp sound SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) - //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn - if(CONFIG_GET(flag/popup_admin_pm)) - INVOKE_ASYNC(src, .proc/popup_admin_pm, recipient, msg) - - else //neither are admins - to_chat(src, - type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.", - confidential = TRUE) - return + else //neither are admins + if(!current_ticket) + to_chat(src, + type = MESSAGE_TYPE_ADMINPM, + html = span_danger("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden."), + confidential = TRUE) + to_chat(src, + type = MESSAGE_TYPE_ADMINPM, + html = "[span_danger("Message not sent:")]
[msg]", + confidential = TRUE) + return + current_ticket.message_no_recipient(msg) if(external) log_admin_private("PM: [key_name(src)]->External: [rawmsg]") @@ -306,22 +309,12 @@ html = "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" , confidential = TRUE) -/client/proc/popup_admin_pm(client/recipient, msg) - var/sender = src - var/sendername = key - var/reply = input(recipient, msg,"Admin PM from-[sendername]", "") as message|null //show message and await a reply - if(recipient && reply) - if(sender) - recipient.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them - else - adminhelp(reply) //sender has left, adminhelp instead - #define TGS_AHELP_USAGE "Usage: ticket
![]([SSassets.transport.get_asset_url("fuckywucky.png")]){kind=spacer}
")))
+
+ addtimer(CALLBACK(src, PROC_REF(restore_fucky_wucky)), 600)
+
+/client/proc/restore_fucky_wucky()
+ add_verb(/client/proc/fucky_wucky)
+
/client/proc/toggle_medal_disable()
set category = "Debug"
set name = "Toggle Medal Disable"
diff --git a/code/modules/admin/verbs/overmap_token_manager.dm b/code/modules/admin/verbs/overmap_token_manager.dm
new file mode 100644
index 000000000000..1dc57b17b05e
--- /dev/null
+++ b/code/modules/admin/verbs/overmap_token_manager.dm
@@ -0,0 +1,93 @@
+/client/proc/overmap_datum_token_manager()
+ set name = "Overmap Datum Token Manager"
+ set category = "Admin.Game"
+ set desc = "Manage the tokens of the overmap datum."
+
+ var/static/datum/overmap_datum_token_manager/manager
+ if(isnull(manager))
+ manager = new
+ manager.ui_interact(mob)
+
+/// Datum for the overmap datum token manager.
+/datum/overmap_datum_token_manager
+
+/datum/overmap_datum_token_manager/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/overmap_datum_token_manager/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(isnull(ui))
+ ui = new(user, src, "OvermapTokenManager")
+ ui.open()
+
+/datum/overmap_datum_token_manager/proc/get_name_and_ref(datum/overmap/from)
+ if(isnull(from))
+ return null
+ return list(
+ "name" = from.name,
+ "ref" = REF(from),
+ )
+
+/datum/overmap_datum_token_manager/ui_data(mob/user)
+ . = list()
+ for(var/datum/overmap/overmap_datum as anything in SSovermap.overmap_objects)
+ var/datum_type = "[overmap_datum.type]"
+ if(!(datum_type in .))
+ .[datum_type] = list()
+
+ var/list/datum_info = list()
+ .[datum_type] += list(datum_info)
+
+ datum_info["name"] = overmap_datum.name
+ datum_info["ref"] = REF(overmap_datum)
+ datum_info["token"] = get_name_and_ref(overmap_datum.token)
+ datum_info["position"] = list(overmap_datum.x, overmap_datum.y)
+ datum_info["docked_to"] = get_name_and_ref(overmap_datum.docked_to)
+
+ var/list/docked_info = list()
+ datum_info["docked"] = docked_info
+ for(var/datum/overmap/docked as anything in overmap_datum.contents)
+ docked_info += list(get_name_and_ref(docked))
+
+ if(istype(overmap_datum, /datum/overmap/ship/controlled))
+ var/datum/overmap/ship/controlled/ship = overmap_datum
+ datum_info["ship_port_ref"] = REF(ship.shuttle_port)
+
+/datum/overmap_datum_token_manager/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("vv")
+ var/datum/target = locate(params["ref"])
+ if(isnull(target))
+ return
+ ui.user.client.debug_variables(target)
+ return TRUE
+
+ if("jump")
+ var/target = locate(params["ref"])
+ if(isnull(target))
+ return
+
+ if(!isobserver(ui.user) && !ui.user.client.admin_ghost())
+ return
+ ui.user.forceMove(get_turf(target))
+ return TRUE
+
+ if("token-new")
+ var/datum/overmap/target = locate(params["ref"]) in SSovermap.overmap_objects
+ if(isnull(target))
+ return
+ target.set_or_create_token()
+ message_admins("[key_name_admin(ui.user)] regenerated the token for [target.name] ([target.type])")
+ return TRUE
+
+ if("token-force-update")
+ var/datum/overmap/target = locate(params["ref"]) in SSovermap.overmap_objects
+ if(isnull(target))
+ return
+ target.set_or_create_token(target.token)
+ message_admins("[key_name_admin(ui.user)] forced an update of the token for [target.name] ([target.type])")
+ return TRUE
diff --git a/code/modules/admin/verbs/selectequipment.dm b/code/modules/admin/verbs/selectequipment.dm
index 68eb9bab1216..9bc6ab3dcea9 100644
--- a/code/modules/admin/verbs/selectequipment.dm
+++ b/code/modules/admin/verbs/selectequipment.dm
@@ -106,13 +106,7 @@
/datum/select_equipment/ui_data(mob/user)
var/list/data = list()
- if(!dummy_key)
- init_dummy()
- var/icon/dummysprite = get_flat_human_icon(null,
- dummy_key = dummy_key,
- outfit_override = selected_outfit)
- data["icon64"] = icon2base64(dummysprite)
data["name"] = target_mob
var/datum/preferences/prefs = user?.client?.prefs
@@ -129,6 +123,15 @@
/datum/select_equipment/ui_static_data(mob/user)
var/list/data = list()
+ if(!dummy_key)
+ init_dummy()
+ var/icon/dummysprite = get_flat_human_icon(
+ null,
+ dummy_key = dummy_key,
+ outfit_override = selected_outfit
+ )
+ data["icon64"] = icon2base64(dummysprite)
+
if(!cached_outfits)
cached_outfits = list()
cached_outfits += list(outfit_entry("General", /datum/outfit, "Naked", priority=TRUE))
@@ -152,7 +155,7 @@
return custom_outfit
-/datum/select_equipment/ui_act(action, params)
+/datum/select_equipment/ui_act(action, params, ui)
if(..())
return
. = TRUE
@@ -171,6 +174,7 @@
return
selected_outfit = new_outfit
+ update_static_data(user, ui)
if("applyoutfit")
var/datum/outfit/new_outfit = resolve_outfit(params["path"])
diff --git a/code/modules/admin/verbs/toggle_ship_spawn.dm b/code/modules/admin/verbs/toggle_ship_spawn.dm
new file mode 100644
index 000000000000..ffaed8c6c442
--- /dev/null
+++ b/code/modules/admin/verbs/toggle_ship_spawn.dm
@@ -0,0 +1,19 @@
+GLOBAL_VAR_INIT(ship_spawn_enabled, TRUE)
+
+/client/proc/toggle_ship_spawn()
+ set name = "Toggle Ship Spawn"
+ set category = "Server"
+ set desc = "Toggles the ability of players to create ships via the roundstart screen or shuttle creator."
+
+ if(!holder)
+ to_chat(src, "Only administrators may use this command.", confidential = TRUE)
+ return
+ if(check_rights(R_ADMIN, 1))
+ GLOB.ship_spawn_enabled ^= TRUE
+ var/message
+ if(GLOB.ship_spawn_enabled)
+ message = "[key_name_admin(usr)] enabled player ship spawning."
+ else
+ message = "[key_name_admin(usr)] disabled player ship spawning."
+ message_admins(message)
+ log_game(message)
diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
index 641c21bd5b24..fcfbfc7f8646 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
@@ -41,7 +41,8 @@
/datum/surgery_step/gland_insert
name = "insert gland"
- implements = list(/obj/item/organ/heart/gland = 100)
+ implements = list(
+ /obj/item/organ/heart/gland = 100)
time = 32
/datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/antagonists/abductor/equipment/glands/transform.dm b/code/modules/antagonists/abductor/equipment/glands/transform.dm
index de718235d79b..1b2c55a6e696 100644
--- a/code/modules/antagonists/abductor/equipment/glands/transform.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/transform.dm
@@ -11,5 +11,5 @@
/obj/item/organ/heart/gland/transform/activate()
to_chat(owner, "You feel unlike yourself.")
randomize_human(owner)
- var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/moth, /datum/species/fly, /datum/species/squid))
+ var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/moth, /datum/species/fly,))
owner.set_species(species)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 4e68c4bf7fd8..acce4799bf77 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -1019,16 +1019,7 @@ structure_check() searches for nearby cultist structures required for the invoca
if(51 to 60)
var/datum/round_event_control/spider_infestation/SI = new()
SI.runEvent()
- if(61 to 70)
- var/datum/round_event_control/anomaly/anomaly_flux/AF
- var/datum/round_event_control/anomaly/anomaly_grav/AG
- var/datum/round_event_control/anomaly/anomaly_pyro/AP
- var/datum/round_event_control/anomaly/anomaly_vortex/AV
- AF.runEvent()
- AG.runEvent()
- AP.runEvent()
- AV.runEvent()
- if(71 to 80)
+ if(61 to 80)
var/datum/round_event_control/spacevine/SV = new()
var/datum/round_event_control/grey_tide/GT = new()
SV.runEvent()
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index b9f2ee96ffda..db65e0cbd688 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -615,7 +615,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
cost = 25
power_type = /datum/action/innate/ai/break_fire_alarms
unlock_text = "You replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will."
- unlock_sound = 'goon/sound/machinery/firealarm.ogg'
+ unlock_sound = 'sound/machines/firealarm.ogg'
/datum/action/innate/ai/break_fire_alarms
name = "Override Thermal Sensors"
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index e745323efc0a..a5be27f88526 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -185,6 +185,7 @@
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
resistance_flags = FIRE_PROOF
var/anomaly_type = /obj/effect/anomaly
+ var/research
/obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
if(!signal)
@@ -193,10 +194,12 @@
return FALSE
if(suicider)
manual_suicide(suicider)
- for(var/obj/effect/anomaly/A in get_turf(src))
- A.anomalyNeutralize()
+ for(var/obj/effect/anomaly/Anomaly in get_turf(src))
+ Anomaly.anomalyNeutralize()
return TRUE
+
+
/obj/item/assembly/signaler/anomaly/manual_suicide(mob/living/carbon/user)
user.visible_message("[user]'s [src] is reacting to the radio signal, warping [user.p_their()] body!")
user.set_suicide(TRUE)
@@ -208,7 +211,25 @@
to_chat(user, "Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code].")
..()
+/obj/item/assembly/signaler/anomaly/det_signal
+ name = "anomaly field"
+ research = null
+ anomaly_type = null
+
+/obj/item/assembly/signaler/anomaly/det_signal/receive_signal(datum/signal/signal)
+ if(!signal)
+ return FALSE
+ if(signal.data["code"] != code)
+ return FALSE
+ if(suicider)
+ manual_suicide(suicider)
+ for(var/obj/effect/anomaly/Anomaly in get_turf(src))
+ Anomaly.detonate()
+ return TRUE
+
+
//Anomaly cores
+
/obj/item/assembly/signaler/anomaly/pyro
name = "\improper pyroclastic anomaly core"
desc = "The neutralized core of a pyroclastic anomaly. It feels warm to the touch. It'd probably be valuable for research."
@@ -237,7 +258,44 @@
name = "\improper vortex anomaly core"
desc = "The neutralized core of a vortex anomaly. It won't sit still, as if some invisible force is acting on it. It'd probably be valuable for research."
icon_state = "vortex core"
- anomaly_type = /obj/effect/anomaly/bhole
+ anomaly_type = /obj/effect/anomaly/vortex
+
+/obj/item/assembly/signaler/anomaly/hallucination
+ name = "\improper hallucination anomaly core"
+ desc = "The neutralized core of a hallucination anomaly. It seems to be moving, but it's probably your imagination. It'd probably be valuable for research."
+ icon_state = "hallucination_core"
+ anomaly_type = /obj/effect/anomaly/hallucination
+
+/obj/item/assembly/signaler/anomaly/sparkler
+ name = "\improper sparkler anomaly core"
+ desc = "The neutralized core of a sparkler anomaly. Tiny electrical sparks arc off it."
+ anomaly_type = /obj/effect/anomaly/sparkler
+
+/obj/item/assembly/signaler/anomaly/veins
+ name = "\improper fountain anomaly core"
+ desc = "The neutralized core of a fountain anomaly. Blood drips off of it."
+ anomaly_type = /obj/effect/anomaly/sparkler
+
+/obj/item/assembly/signaler/anomaly/phantom
+ name = "\improper phantom anomaly core"
+ desc = "The neutralized core of a phantom anomaly. It quietly screams."
+ anomaly_type = /obj/effect/anomaly/phantom
+
+/obj/item/assembly/signaler/anomaly/pulsar
+ name = "\improper pulsar anomaly core"
+ desc = "The neutralized core of a pulsar anomaly. Electromagnetic crackles come off it."
+
+/obj/item/assembly/signaler/anomaly/plasmasoul
+ name = "\improper plasmasoul anomaly core"
+ desc = "The neutralized core of a plasmasoul anomaly. The air around it hisses."
+
+/obj/item/assembly/signaler/anomaly/heartbeat
+ name = "\improper heartbeat anomaly core"
+ desc = "The neutralized core of a heartbeat anomaly. It's concerningly warm to the touch."
+
+/obj/item/assembly/signaler/anomaly/tvstatic
+ name = "\improper static anomaly core"
+ desc = "The neutralized core of a static anomaly. Your head hurts just staring at it"
/obj/item/assembly/signaler/anomaly/attack_self()
return
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 77b22505188c..8b76ab432cdf 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -110,6 +110,10 @@
"stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.png'
)
+/datum/asset/simple/fuckywucky
+ assets = list(
+ "fuckywucky.png" = 'html/fuckywucky.png'
+ )
/datum/asset/simple/IRV
assets = list(
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index 6ec5bc73414a..428e8b5a6d18 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -48,10 +48,6 @@
var/bypassing = FALSE
var/visual_update_tick = 0
-#define IGNITE_TURF_CHANCE 30
-#define IGNITE_TURF_LOW_POWER 8
-#define IGNITE_TURF_HIGH_POWER 22
-
/obj/effect/hotspot/Initialize(mapload, starting_volume, starting_temperature)
. = ..()
SSair.hotspots += src
@@ -68,14 +64,6 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
- if(prob(IGNITE_TURF_CHANCE))
- var/turf/my_turf = loc
- my_turf.IgniteTurf(rand(IGNITE_TURF_LOW_POWER,IGNITE_TURF_HIGH_POWER))
-
-#undef IGNITE_TURF_CHANCE
-#undef IGNITE_TURF_LOW_POWER
-#undef IGNITE_TURF_HIGH_POWER
-
/obj/effect/hotspot/proc/perform_exposure()
var/turf/open/location = loc
if(!istype(location) || !(location.air))
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index 9ad5077ba447..383a362a0228 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -149,24 +149,16 @@
cached_results["fire"] = 0
var/turf/open/location = isturf(holder) ? holder : null
- var/burned_fuel = 0
- if(air.get_moles(GAS_O2) < air.get_moles(GAS_TRITIUM))
- burned_fuel = air.get_moles(GAS_O2)/TRITIUM_BURN_OXY_FACTOR
+ var/burned_fuel = max(min(air.get_moles(GAS_TRITIUM), air.get_moles(GAS_O2) / TRITIUM_BURN_OXY_FACTOR), 0) / TRITIUM_BURN_TRIT_FACTOR
+ if(burned_fuel > 0)
air.adjust_moles(GAS_TRITIUM, -burned_fuel)
- else
- burned_fuel = air.get_moles(GAS_TRITIUM)*TRITIUM_BURN_TRIT_FACTOR
- air.adjust_moles(GAS_TRITIUM, -air.get_moles(GAS_TRITIUM)/TRITIUM_BURN_TRIT_FACTOR)
- air.adjust_moles(GAS_O2,-air.get_moles(GAS_TRITIUM))
-
- if(burned_fuel)
+ air.adjust_moles(GAS_O2, -burned_fuel / 2)
+ air.adjust_moles(GAS_H2O, burned_fuel)
energy_released += (FIRE_HYDROGEN_ENERGY_RELEASED * burned_fuel)
+ cached_results["fire"] += burned_fuel
if(location && prob(10) && burned_fuel > TRITIUM_MINIMUM_RADIATION_ENERGY) //woah there let's not crash the server
radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR)
- air.adjust_moles(GAS_H2O, burned_fuel/TRITIUM_BURN_OXY_FACTOR)
-
- cached_results["fire"] += burned_fuel
-
if(energy_released > 0)
var/new_heat_capacity = air.heat_capacity()
if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 3a2030c9dd50..cc9e94b91567 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -940,7 +940,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
/obj/machinery/airalarm/proc/handle_decomp_alarm()
if(!COOLDOWN_FINISHED(src, decomp_alarm))
return
- playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
+ playsound(loc, 'sound/machines/FireAlarm.ogg', 75)
COOLDOWN_START(src, decomp_alarm, 1 SECONDS)
#undef AALARM_MODE_SCRUBBING
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index 6797f16012b7..46ecc06af84b 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -75,9 +75,8 @@
// Every node has a parent pipeline and an air associated with it, but we need to accomdate for edge cases like init dir cache building...
if(parents[i])
nullifyPipenet(parents[i])
- if(airs[i])
- QDEL_NULL(airs[i])
- ..()
+ airs[i] = null
+ return ..()
/obj/machinery/atmospherics/components/on_construction()
..()
@@ -100,25 +99,22 @@
/obj/machinery/atmospherics/components/proc/nullifyPipenet(datum/pipeline/reference)
if(!reference)
CRASH("nullifyPipenet(null) called by [type] on [COORD(src)]")
- for (var/i in 1 to parents.len)
- if (parents[i] == reference)
- reference.other_airs -= airs[i] // Disconnects from the pipeline side
- parents[i] = null // Disconnects from the machinery side.
-
+ var/i = parents.Find(reference)
+ reference.other_airs -= airs[i]
reference.other_atmosmch -= src
-
- /**
- * We explicitly qdel pipeline when this particular pipeline
- * is projected to have no member and cause GC problems.
- * We have to do this because components don't qdel pipelines
- * while pipes must and will happily wreck and rebuild everything
- * again every time they are qdeleted.
+ /*
+ We explicitly qdel pipeline when this particular pipeline
+ is projected to have no member and cause GC problems.
+ We have to do this because components don't qdel pipelines
+ while pipes must and will happily wreck and rebuild
+ everything again every time they are qdeleted.
*/
-
if(!length(reference.other_atmosmch) && !length(reference.members))
if(QDESTROYING(reference))
- CRASH("nullifyPipenet() called on qdeleting [reference]")
+ parents[i] = null
+ CRASH("nullifyPipenet() called on qdeleting [reference] indexed on parents\[[i]\]")
qdel(reference)
+ parents[i] = null
/obj/machinery/atmospherics/components/returnPipenetAirs(datum/pipeline/reference)
var/list/returned_air = list()
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index e1d9d2412101..29c0ff985c9c 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -38,23 +38,22 @@
update = air.react(src)
/datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/base)
- building = TRUE
- var/volume = 0
- if(istype(base, /obj/machinery/atmospherics/pipe))
- var/obj/machinery/atmospherics/pipe/considered_pipe = base
- volume = considered_pipe.volume
- members += considered_pipe
- if(considered_pipe.air_temporary)
- air = considered_pipe.air_temporary
- considered_pipe.air_temporary = null
- else
- addMachineryMember(base)
-
- if(!air)
- air = new
-
- air.set_volume(volume)
- SSair.add_to_expansion(src, base)
+ if(!QDELETED(base))
+ building = TRUE
+ var/volume = 0
+ if(istype(base, /obj/machinery/atmospherics/pipe))
+ var/obj/machinery/atmospherics/pipe/considered_pipe = base
+ volume = considered_pipe.volume
+ members += considered_pipe
+ if(considered_pipe.air_temporary)
+ air = considered_pipe.air_temporary
+ considered_pipe.air_temporary = null
+ else
+ addMachineryMember(base)
+ if(!air)
+ air = new
+ air.set_volume(volume)
+ SSair.add_to_expansion(src, base)
///Has the same effect as build_pipeline(), but this doesn't queue its work, so overrun abounds. It's useful for the pregame
/datum/pipeline/proc/build_pipeline_blocking(obj/machinery/atmospherics/base)
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 0064fbe8f403..720d22f6bff2 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -86,7 +86,6 @@
QDEL_NULL(parent)
releaseAirToTurf()
- QDEL_NULL(air_temporary)
var/turf/T = loc
for(var/obj/machinery/meter/meter in T)
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 0b238294f749..4c6d0ecf498f 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -24,7 +24,6 @@
/obj/machinery/portable_atmospherics/Destroy()
SSair.stop_processing_machine(src)
disconnect()
- qdel(air_contents)
air_contents = null
return ..()
diff --git a/code/modules/autowiki/autowiki.dm b/code/modules/autowiki/autowiki.dm
new file mode 100644
index 000000000000..815ac0192f19
--- /dev/null
+++ b/code/modules/autowiki/autowiki.dm
@@ -0,0 +1,49 @@
+/// When the `AUTOWIKI` define is enabled, will generate an output file for tools/autowiki/autowiki.js to consume.
+/// Autowiki code intentionally still *exists* even without the define, to ensure developers notice
+/// when they break it immediately, rather than until CI or worse, call time.
+#if defined(AUTOWIKI) || defined(UNIT_TESTS)
+/proc/setup_autowiki()
+ Master.sleep_offline_after_initializations = FALSE
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/generate_autowiki))
+ SSticker.start_immediately = TRUE
+ CONFIG_SET(number/round_end_countdown, 0)
+
+/proc/generate_autowiki()
+ var/output = generate_autowiki_output()
+ rustg_file_write(output, "data/autowiki_edits.txt")
+ qdel(world)
+#endif
+
+/// Returns a string of the autowiki output file
+/proc/generate_autowiki_output()
+ var/total_output = ""
+
+ for (var/datum/autowiki/autowiki_type as anything in subtypesof(/datum/autowiki))
+ var/datum/autowiki/autowiki = new autowiki_type
+ var/output = autowiki.generate()
+
+ //Generates a page for each key:value pair with the key as the title and the value as the content, and generates an index at the root page
+ if(islist(output))
+ var/root = ""
+ for(var/title in output)
+ total_output += json_encode(list(
+ "title" = "[autowiki.page]/[title]",
+ "text" = output[title],
+ )) + "\n"
+ root += "\n\n" + autowiki.include_template("[autowiki.page]/[title]")
+
+ //Run the next conditional
+ output = root
+
+ //Generates a single page with the output.
+ if (istext(output))
+ total_output += json_encode(list(
+ "title" = autowiki.page,
+ "text" = output,
+ )) + "\n"
+
+ continue
+
+ CRASH("[autowiki_type] does not generate a proper output!")
+
+ return total_output
diff --git a/code/modules/autowiki/pages/base.dm b/code/modules/autowiki/pages/base.dm
new file mode 100644
index 000000000000..8e745ace61c2
--- /dev/null
+++ b/code/modules/autowiki/pages/base.dm
@@ -0,0 +1,54 @@
+/// A representation of an automated wiki page.
+/datum/autowiki
+ /// The page on the wiki to be replaced.
+ /// This should never be a user-facing page, like "Guide to circuits".
+ /// It should always be a template that only Autowiki should touch.
+ /// For example: "Template:Autowiki/CircuitInfo".
+ var/page
+
+/// Override and return the new text of the page.
+/// This proc can be impure, usually to call `upload_file`.
+/datum/autowiki/proc/generate()
+ SHOULD_CALL_PARENT(FALSE)
+ CRASH("[type] does not implement generate()!")
+
+/// Generates an auto formatted template user.
+/// Your autowiki should ideally be a *lot* of these.
+/// It lets wiki editors edit it much easier later, without having to enter repo.
+/// Parameters will be passed in by name. That means your template should expect
+/// something that looks like `{{ Autowiki_Circuit|name=Combiner|description=This combines }}`
+/// Lists, which must be array-like (no keys), will be turned into a flat list with their key and a number,
+/// such that list("food" = list("fruit", "candy")) -> food1=fruit|food2=candy
+/datum/autowiki/proc/include_template(name, parameters)
+ var/template_text = "{{[name]"
+
+ var/list/prepared_parameters = list()
+ for (var/key in parameters)
+ var/value = parameters[key]
+ if (islist(value))
+ for (var/index in 1 to length(value))
+ prepared_parameters["[key][index]"] = "[value[index]]"
+ else
+ prepared_parameters[key] = value
+
+ for (var/parameter_name in prepared_parameters)
+ template_text += "|[parameter_name]="
+ template_text += "[prepared_parameters[parameter_name]]"
+
+ template_text += "}}"
+
+ return template_text
+
+/// Takes an icon and uploads it to Autowiki-name.png.
+/// Do your best to make sure this is unique, so it doesn't clash with other autowiki icons.
+/datum/autowiki/proc/upload_icon(icon/icon, name)
+ // Fuck you
+ if (IsAdminAdvancedProcCall())
+ return
+
+ fcopy(icon, "data/autowiki_files/[name].png")
+
+/// Escape a parameter such that it can be correctly put inside a wiki output
+/datum/autowiki/proc/escape_value(parameter)
+ // | is a special character in MediaWiki, and must be escaped by...using another template.
+ return replacetextEx(parameter, "|", "{{!}}")
diff --git a/code/modules/autowiki/pages/reagents.dm b/code/modules/autowiki/pages/reagents.dm
new file mode 100644
index 000000000000..d10137d07f53
--- /dev/null
+++ b/code/modules/autowiki/pages/reagents.dm
@@ -0,0 +1,65 @@
+/*
+Templates:
+
+Autowiki/Reaction
+{{{chems|ERROR}}} {{#if: {{{temperature|}}} | Temperature {{{temperature}}} | }} {{#if: {{{container|}}} |
Needs container "{{{container}}}" | }}
Makes {{{volume|1}}}u + +Autowiki/Reagent +{{#if: {{{tooltip|}}} | {{Tooltip|{{{volume}}} part [[#{{{name}}}|{{{name}}}]]|{{{tooltip}}}|FEF6E7}} | {{{volume}}} part {{{name}}} }} + +*/ + +/datum/autowiki/reagents + page = "Template:Autowiki/Content/Reactions" + +/datum/autowiki/reagents/generate() + var/list/output = list() + + var/list/mixable_reagents = list() + var/list/all_reactions = list() + for(var/type in subtypesof(/datum/chemical_reaction)) + var/datum/chemical_reaction/reaction = new type + all_reactions += reaction + mixable_reagents |= reaction.results + + for(var/datum/chemical_reaction/reaction as anything in all_reactions) + var/required_chems = "" + for(var/datum/reagent/required_chem_type as anything in reaction.required_reagents) + var/has_tooltip = (required_chem_type in mixable_reagents) && !(required_chem_type in reaction.results) && !(required_chem_type in GLOB.base_reagents) + required_chems += format_required_reagent(required_chem_type, reaction.required_reagents[required_chem_type], has_tooltip) + + for(var/datum/reagent/required_catalyst_type as anything in reaction.required_catalysts) + var/has_tooltip = (required_catalyst_type in mixable_reagents) && !(required_catalyst_type in reaction.results) && !(required_catalyst_type in GLOB.base_reagents) + required_chems += format_required_reagent(required_catalyst_type, reaction.required_catalysts[required_catalyst_type], has_tooltip, "Catalyst") + + for(var/datum/reagent/result_chem_type as anything in reaction.results) + var/result_name = escape_value(initial(result_chem_type.name)) + var/list/details = list("volume" = reaction.results[result_chem_type], "chems" = required_chems, "name" = result_name) + + if(reaction.required_temp > 0) + details["temperature"] = "[reaction.is_cold_recipe ? "below" : "above"] [reaction.required_temp]K" + + if(reaction.required_container) + details["container"] = "[escape_value(initial(reaction.required_container.name))]" + + var/description = include_template("Autowiki/Reaction", details) + if(result_name in output) + output[result_name] += "
OR
[description]" + else + output[result_name] = description + + return output + +/datum/autowiki/reagents/proc/format_required_reagent(datum/reagent/required_reagent_type, volume, has_tooltip = FALSE, type) + var/list/details = list( + "volume" = volume, + "name" = escape_value(initial(required_reagent_type.name)) + ) + + if(has_tooltip) + details["tooltip"] = include_template("Autowiki/Content/Reactions/[initial(required_reagent_type.name)]") + + if(type) + details["type"] = type + + return include_template("Autowiki/Reagent", details) diff --git a/code/modules/autowiki/pages/ships.dm b/code/modules/autowiki/pages/ships.dm new file mode 100644 index 000000000000..372e9d14a9cb --- /dev/null +++ b/code/modules/autowiki/pages/ships.dm @@ -0,0 +1,96 @@ +/datum/autowiki/ship + page = "Template:Autowiki/Content/Ships" + var/mob/living/carbon/human/dummy/consistent/wiki_dummy = new() + +/datum/autowiki/ship/generate() + var/list/output = list() + + for(var/shipname in SSmapping.shuttle_templates) + var/datum/map_template/shuttle/ship = SSmapping.shuttle_templates[shipname] + + if(!length(ship.job_slots)) + continue + + var/size = "Unknown" + var/longest_dimension = max(ship.width, ship.height) + switch(longest_dimension) + if(0 to 19) + size = "Small" + if(20 to 39) + size = "Medium" + if(40 to 56) + size = "Large" + if(57 to INFINITY) + size = "Undockable" //let's hope this is never the case + + var/ship_name = escape_value(ship.name) + output[ship_name] = include_template("Autowiki/Ship", list( + "name" = ship_name, + "shortname" = escape_value(ship.short_name) || ship_name, + "description" = escape_value(ship.description), + "prefix" = escape_value(ship.prefix), + "tags" = escape_value(ship.tags?.Join(", ")), + "limit" = ship.limit, + "crewCount" = count_crew(ship.job_slots), + "crew" = format_crew_list(ship.job_slots), + "enabled" = ship.enabled ? "Yes" : "No", + "size" = size + )) + + //Other fields: manufacturer, faction, color + + return output + +/datum/autowiki/ship/proc/count_crew(list/crew) + var/output = 0 + + for(var/job in crew) + output += crew[job] + + return output + +/datum/autowiki/ship/proc/format_crew_list(list/crew) + var/output = "" + + var/static/list/job_icon_list = list() + var/mob/living/carbon/human/dummy/wiki_dummy = new(locate(1,1,1)) + wiki_dummy.setDir(SOUTH) + for(var/datum/job/job as anything in crew) + var/filename = SANITIZE_FILENAME(escape_value(format_text(initial(job.outfit.name)))) + + output += include_template("Autowiki/ShipCrewMember", list( + "name" = escape_value(job.name), + "officer" = job.officer ? "Yes" : "No", + "slots" = crew[job], + "icon" = filename + )) + + //Only generate each unique outfit once + if(filename in job_icon_list) + continue + + upload_icon(get_dummy_image(job, filename), filename) + + return output + +/datum/autowiki/ship/proc/get_dummy_image(datum/job/to_equip, filename) + //Limited to just the humanoid-compliant roundstart species, but at least it's not just human. + var/static/list/species = list(/datum/species/ethereal, /datum/species/human, /datum/species/ipc, /datum/species/lizard, /datum/species/moth, /datum/species/spider) + //Length times ascii char of the last letter, good enough(?) #entropy + var/seed = length(filename) * text2ascii(filename, length(filename)) + //Controlled randomisation + wiki_dummy.seeded_randomization(seed) + //Each outfit will always have the same species + wiki_dummy.set_species(species[seed % length(species) + 1]) + //Delete all the old stuff they had + wiki_dummy.wipe_state() + + to_equip.equip(wiki_dummy, TRUE, FALSE) + COMPILE_OVERLAYS(wiki_dummy) + var/icon/wiki_icon = icon(getFlatIcon(wiki_dummy), frame = 1) + + //Make all icons 32x32 for wiki sizing consistency + if(wiki_icon.Height() != 32 || wiki_icon.Width() != 32) + wiki_icon.Crop(1, 1, 32, 32) + + return wiki_icon diff --git a/code/modules/autowiki/pages/techweb.dm b/code/modules/autowiki/pages/techweb.dm new file mode 100644 index 000000000000..0f4b87f9e2a2 --- /dev/null +++ b/code/modules/autowiki/pages/techweb.dm @@ -0,0 +1,64 @@ +/datum/autowiki/techweb + page = "Template:Autowiki/Content/Techweb" + +/datum/autowiki/techweb/generate() + var/output = "" + + for (var/node_id in sortList(SSresearch.techweb_nodes, /proc/sort_research_nodes)) + var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id] + if (!node.show_on_wiki) + continue + + if (!valid_node(node)) + continue + + output += "\n\n" + include_template("Autowiki/TechwebEntry", list( + "name" = escape_value(node.display_name), + "description" = escape_value(node.description), + "prerequisites" = generate_prerequisites(node.prereq_ids), + "designs" = generate_designs(node.design_ids), + )) + + return output + +/datum/autowiki/techweb/proc/valid_node(datum/techweb_node/node) + return !node.experimental + +/datum/autowiki/techweb/proc/generate_designs(list/design_ids) + var/output = "" + + for (var/design_id in design_ids) + var/datum/design/design = SSresearch.techweb_designs[design_id] + output += include_template("Autowiki/TechwebEntryDesign", list( + "name" = escape_value(design.name), + "description" = escape_value(design.get_description()), + )) + + return output + +/datum/autowiki/techweb/proc/generate_prerequisites(list/prereq_ids) + var/output = "" + + for (var/prereq_id in prereq_ids) + var/datum/techweb_node/node = SSresearch.techweb_nodes[prereq_id] + output += include_template("Autowiki/TechwebEntryPrerequisite", list( + "name" = escape_value(node.display_name), + )) + + return output + +/datum/autowiki/techweb/experimental + page = "Template:Autowiki/Content/Techweb/Experimental" + +/datum/autowiki/techweb/experimental/valid_node(datum/techweb_node/node) + return node.experimental + +/proc/sort_research_nodes(node_id_a, node_id_b) + var/datum/techweb_node/node_a = SSresearch.techweb_nodes[node_id_a] + var/datum/techweb_node/node_b = SSresearch.techweb_nodes[node_id_b] + + var/prereq_difference = node_a.prereq_ids.len - node_b.prereq_ids.len + if (prereq_difference != 0) + return prereq_difference + + return sorttext(node_b.display_name, node_a.display_name) diff --git a/code/modules/autowiki/pages/vending.dm b/code/modules/autowiki/pages/vending.dm new file mode 100644 index 000000000000..aeb8fb42bb2c --- /dev/null +++ b/code/modules/autowiki/pages/vending.dm @@ -0,0 +1,56 @@ +/datum/autowiki/vending + page = "Template:Autowiki/Content/VendingMachines" + +/datum/autowiki/vending/generate() + var/output = "" + + var/list/cached_products = list() + + // `powered()` checks if its in a null loc to say it's not powered. + // So we put it inside, something + var/obj/parent = new + + for (var/vending_type in sortList(subtypesof(/obj/machinery/vending), /proc/cmp_typepaths_asc)) + var/obj/machinery/vending/vending_machine = new vending_type(parent) + vending_machine.use_power = FALSE + vending_machine.update_icon(UPDATE_ICON_STATE) + + // Technically won't match if product amounts change, but this isn't likely + var/products_cache_key = vending_machine.products.Join("-") + "&" + vending_machine.contraband.Join("-") + "&" + vending_machine.premium.Join("-") + + // In the future, this should show all vending machines that have the same products + if (products_cache_key in cached_products) + qdel(vending_machine) + continue + + cached_products += products_cache_key + + var/filename = SANITIZE_FILENAME(escape_value(format_text(vending_machine.name))) + + output += include_template("Autowiki/VendingMachine", list( + "icon" = escape_value(filename), + "name" = escape_value(format_text(vending_machine.name)), + "products" = format_product_list(vending_machine.products), + "contraband" = format_product_list(vending_machine.contraband), + "premium" = format_product_list(vending_machine.premium), + )) + + // It would be cool to make this support gifs someday, but not now + upload_icon(getFlatIcon(vending_machine, no_anim = TRUE), filename) + + qdel(vending_machine) + + qdel(parent) + + return output + +/datum/autowiki/vending/proc/format_product_list(list/product_list) + var/output = "" + + for (var/obj/product_path as anything in product_list) + output += include_template("Autowiki/VendingMachineProduct", list( + "name" = escape_value(capitalize(format_text(initial(product_path.name)))), + "amount" = product_list[product_path], + )) + + return output diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 891065f4264a..ac1c4b8bbfdf 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -107,7 +107,7 @@ /obj/machinery/computer/cargo/express/ui_interact(mob/living/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "OutpostComms", name) + ui = new(user, src, "OutpostCommunications", name) ui.open() if(!charge_account) reconnect() @@ -127,7 +127,7 @@ data["outpostDocked"] = outpost_docked data["points"] = charge_account ? charge_account.account_balance : 0 data["siliconUser"] = user.has_unlimited_silicon_privilege && check_ship_ai_access(user) - data["beaconzone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui + data["beaconZone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui data["usingBeacon"] = use_beacon //is the mode set to deliver to the beacon or the cargobay? data["canBeacon"] = !use_beacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location? data["canBuyBeacon"] = charge_account ? (cooldown <= 0 && charge_account.account_balance >= BEACON_COST) : FALSE diff --git a/code/modules/cargo/packs/chemistry.dm b/code/modules/cargo/packs/chemistry.dm new file mode 100644 index 000000000000..2375328b2bc1 --- /dev/null +++ b/code/modules/cargo/packs/chemistry.dm @@ -0,0 +1,131 @@ +/datum/supply_pack/chemistry + group = "Chemistry" + crate_type = /obj/structure/closet/crate/chem + +/* + Tools +*/ + +/datum/supply_pack/chemistry/starter + name = "Chemical Starter Kit Crate" + desc = "Contains thirteen different chemicals, for all the fun experiments you can make." + cost = 1250 // This is intentionally underpriced; the hope is that people will start using ghettochem, upon which time the price can be raised. + contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen, + /obj/item/reagent_containers/glass/bottle/carbon, + /obj/item/reagent_containers/glass/bottle/nitrogen, + /obj/item/reagent_containers/glass/bottle/oxygen, + /obj/item/reagent_containers/glass/bottle/fluorine, + /obj/item/reagent_containers/glass/bottle/phosphorus, + /obj/item/reagent_containers/glass/bottle/silicon, + /obj/item/reagent_containers/glass/bottle/chlorine, + /obj/item/reagent_containers/glass/bottle/radium, + /obj/item/reagent_containers/glass/bottle/sacid, + /obj/item/reagent_containers/glass/bottle/ethanol, + /obj/item/reagent_containers/glass/bottle/potassium, + /obj/item/reagent_containers/glass/bottle/sugar, + /obj/item/reagent_scanner, + /obj/item/reagent_containers/dropper, + /obj/item/storage/box/beakers) + crate_name = "chemical starter crate" + +/datum/supply_pack/chemistry/tools + name = "Chemical Synthesis Crate" + desc = "Contains all the tools you will need for drug making." + cost = 750 + contains = list(/obj/item/reagent_containers/glass/filter, + /obj/item/book/manual/wiki/chemistry, + /obj/item/clothing/glasses/science, + /obj/item/hand_labeler, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/scanning_module, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/micro_laser) + crate_name = "chemistry tools crate" + +/* + Bulk materials +*/ + +/datum/supply_pack/chemistry/carbon + name = "Bulk Carbon Crate" + desc = "Contains a jug filled with 150u of carbon." + cost = 500 + contains = list(/obj/item/reagent_containers/glass/chem_jug/carbon) + crate_name = "bulk carbon crate" + +/datum/supply_pack/chemistry/oxygen + name = "Bulk Oxygen Crate" + desc = "Contains a jug filled with 150u of oxygen." + cost = 500 + contains = list(/obj/item/reagent_containers/glass/chem_jug/oxygen) + crate_name = "bulk oxygen crate" + +/datum/supply_pack/chemistry/hydrogen + name = "Bulk Hydrogen Crate" + desc = "Contains a jug filled with 150u of Hydrogen." + cost = 500 + contains = list(/obj/item/reagent_containers/glass/chem_jug/hydrogen) + crate_name = "bulk hydrogen crate" + +/datum/supply_pack/chemistry/nitrogen + name = "Bulk Nitrogen Crate" + desc = "Contains a jug filled with 150u of nitrogen." + cost = 625 + contains = list(/obj/item/reagent_containers/glass/chem_jug/nitrogen) + crate_name = "bulk nitrogen crate" + +/datum/supply_pack/chemistry/aluminium + name = "Bulk Aluminium Crate" + desc = "Contains a jug filled with 150u of aluminium." + cost = 625 + contains = list(/obj/item/reagent_containers/glass/chem_jug/aluminium) + crate_name = "bulk aluminium crate" + +/datum/supply_pack/chemistry/copper + name = "Bulk Copper Crate" + desc = "Contains a jug filled with 150u of copper." + cost = 625 + contains = list(/obj/item/reagent_containers/glass/chem_jug/copper) + crate_name = "bulk copper crate" + +/datum/supply_pack/chemistry/bromine + name = "Bulk Bromine Crate" + desc = "Contains a jug filled with 150u of bromine." + cost = 625 + contains = list(/obj/item/reagent_containers/glass/chem_jug/bromine) + crate_name = "bulk bromine crate" + +/datum/supply_pack/chemistry/iodine + name = "Bulk Iodine Crate" + desc = "Contains a jug filled with 150u of iodine." + cost = 750 + contains = list(/obj/item/reagent_containers/glass/chem_jug/iodine) + crate_name = "bulk iodine crate" + +/datum/supply_pack/chemistry/potassium + name = "Bulk Potassium Crate" + desc = "Contains a jug filled with 150u of potassium." + cost = 750 + contains = list(/obj/item/reagent_containers/glass/chem_jug/potassium) + crate_name = "bulk potassium crate" + +/datum/supply_pack/chemistry/sulfur + name = "Bulk Sulfur Crate" + desc = "Contains a jug filled with 150u of sulfur." + cost = 750 + contains = list(/obj/item/reagent_containers/glass/chem_jug/sulfur) + crate_name = "bulk sulfur crate" + +/datum/supply_pack/chemistry/chlorine + name = "Bulk Chlorine Crate" + desc = "Contains a jug filled with 150u of chlorine." + cost = 750 + contains = list(/obj/item/reagent_containers/glass/chem_jug/chlorine) + crate_name = "bulk chlorine crate" + +/datum/supply_pack/chemistry/radium + name = "Bulk Radium Crate" + desc = "Contains a jug filled with 150u of radium." + cost = 1000 + contains = list(/obj/item/reagent_containers/glass/chem_jug/radium) + crate_name = "bulk radium crate" diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 3273b28e153b..e5b72b4b5c4f 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -89,28 +89,6 @@ crate_name = "blood freezer" crate_type = /obj/structure/closet/crate/freezer -/datum/supply_pack/medical/chemical - name = "Chemical Starter Kit Crate" - desc = "Contains thirteen different chemicals, for all the fun experiments you can make." - cost = 1000 // This is intentionally underpriced; the hope is that people will start using ghettochem, upon which time the price can be raised. - contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen, - /obj/item/reagent_containers/glass/bottle/carbon, - /obj/item/reagent_containers/glass/bottle/nitrogen, - /obj/item/reagent_containers/glass/bottle/oxygen, - /obj/item/reagent_containers/glass/bottle/fluorine, - /obj/item/reagent_containers/glass/bottle/phosphorus, - /obj/item/reagent_containers/glass/bottle/silicon, - /obj/item/reagent_containers/glass/bottle/chlorine, - /obj/item/reagent_containers/glass/bottle/radium, - /obj/item/reagent_containers/glass/bottle/sacid, - /obj/item/reagent_containers/glass/bottle/ethanol, - /obj/item/reagent_containers/glass/bottle/potassium, - /obj/item/reagent_containers/glass/bottle/sugar, - /obj/item/clothing/glasses/science, - /obj/item/reagent_containers/dropper, - /obj/item/storage/box/beakers) - crate_name = "chemical crate" - /datum/supply_pack/medical/surplus name = "Medical Surplus Crate" desc = "Contains an assortment of medical supplies haphazardly pulled from storage. German doctor not included." diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 90fb4fa0972c..5c5553df2755 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( // Instantiate tgui panel tgui_panel = new(src) - GLOB.ahelp_tickets.ClientLogin(src) + GLOB.ahelp_tickets.client_login(src) GLOB.interviews.client_login(src) var/connecting_admin = FALSE //because de-admined admins connecting should be treated like admins. //Admin Authorisation @@ -489,7 +489,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( GLOB.clients -= src GLOB.directory -= ckey log_access("Logout: [key_name(src)]") - GLOB.ahelp_tickets.ClientLogout(src) + GLOB.ahelp_tickets.client_logout(src) GLOB.interviews.client_logout(src) SSserver_maint.UpdateHubStatus() if(credits) @@ -890,11 +890,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( return if (prefs.hotkeys) - // If hotkey mode is enabled, then clicking the map will automatically - // unfocus the text bar. This removes the red color from the text bar - // so that the visual focus indicator matches reality. - winset(src, null, "input.background-color=[COLOR_INPUT_DISABLED]") - + winset(src, null, "input.focus=false") + else + winset(src, null, "input.focus=true") ..() /client/proc/add_verbs_from_config() diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm index 1e6aae68fb72..671c0efe9602 100644 --- a/code/modules/client/loadout/loadout_general.dm +++ b/code/modules/client/loadout/loadout_general.dm @@ -163,8 +163,3 @@ /datum/gear/surgical_mask display_name = "surgical mask" path = /obj/item/clothing/mask/surgical - -/datum/gear/maidbox - display_name = "maid outfit bundle" - path = /obj/item/storage/box/maid - description = "Contains a four-piece maid outfit inside a single box." diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm index 2daf575a12ec..e2800a87e9e1 100644 --- a/code/modules/client/loadout/loadout_suit.dm +++ b/code/modules/client/loadout/loadout_suit.dm @@ -43,14 +43,6 @@ display_name = "goth jacket" path = /obj/item/clothing/suit/gothcoat -/datum/gear/suit/jacket/bronze - display_name = "bronze suit" - path = /obj/item/clothing/suit/bronze - -/datum/gear/suit/jacket/yakuza - display_name = "yakuza suit" - path = /obj/item/clothing/suit/yakuza - /datum/gear/suit/jacket/burgundy display_name = "suit jacket, burgundy" path = /obj/item/clothing/suit/toggle/lawyer/burgundy @@ -63,7 +55,23 @@ display_name = "suit jacket, charcoal" path = /obj/item/clothing/suit/toggle/lawyer/charcoal -/datum/gear/suit/jacket/navy +/datum/gear/suit/jacket/navy //why is this blank? i dont know + +/datum/gear/suit/jacket/hoodie_black + display_name = "hoodie, black" + path = /obj/item/clothing/suit/hooded/hoodie/black + +/datum/gear/suit/jacket/hoodie_red + display_name = "hoodie, red" + path = /obj/item/clothing/suit/hooded/hoodie/red + +/datum/gear/suit/jacket/hoodie_blue + display_name = "hoodie, blue" + path = /obj/item/clothing/suit/hooded/hoodie/blue + +/datum/gear/suit/jacket/hoodie_gray + display_name = "hoodie, gray" + path = /obj/item/clothing/suit/hooded/hoodie/gray /datum/gear/suit/jacket/highvis display_name = "industrial jacket" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e209e180d518..82cf7eb653de 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //doohickeys for savefiles var/path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used - var/max_save_slots = 10 + var/max_save_slots = 20 //non-preference stuff var/muted = 0 @@ -68,23 +68,26 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/real_name //our character's name var/gender = MALE //gender of character (well duh) var/age = 30 //age of character - var/underwear = "Nude" //underwear type - var/underwear_color = "000" //underwear color - var/undershirt = "Nude" //undershirt type - var/socks = "Nude" //socks type - var/backpack = DBACKPACK //backpack type + var/underwear = "Nude" //Type of underwear + var/underwear_color = "000" //Greyscale color of underwear + var/undershirt = "Nude" //Type of undershirt + var/undershirt_color = "000" //Greyscale color of undershirt + var/socks = "Nude" //Type of socks + var/socks_color = "000" //Greyscale color of socks + var/backpack = DBACKPACK //Type of backpack var/jumpsuit_style = PREF_SUIT //suit/skirt var/exowear = PREF_EXOWEAR //exowear var/hairstyle = "Bald" //Hair type var/hair_color = "000" //Hair color - var/facial_hairstyle = "Shaved" //Face hair type + var/facial_hairstyle = "Shaved" //Face hair type var/facial_hair_color = "000" //Facial hair color var/skin_tone = "caucasian1" //Skin color var/eye_color = "000" //Eye color var/datum/species/pref_species = new /datum/species/human() //Mutant race - var/species_looking_at = "human" //used as a helper to keep track of in the species select thingy + var/species_looking_at = "human" //used as a helper to keep track of in the species select thingy var/list/features = list( "mcolor" = "FFF", + "mcolor2" = "FFF", "grad_style" = "None", "grad_color" = "FFF", "ethcolor" = "9c3030", @@ -119,12 +122,37 @@ GLOBAL_LIST_EMPTY(preferences_datums) "flavor_text" = "", "body_size" = "Normal" ) - var/list/randomise = list(RANDOM_UNDERWEAR = TRUE, RANDOM_UNDERWEAR_COLOR = TRUE, RANDOM_UNDERSHIRT = TRUE, RANDOM_SOCKS = TRUE, RANDOM_BACKPACK = TRUE, RANDOM_JUMPSUIT_STYLE = TRUE, RANDOM_EXOWEAR_STYLE = TRUE, RANDOM_HAIRSTYLE = TRUE, RANDOM_HAIR_COLOR = TRUE, RANDOM_FACIAL_HAIRSTYLE = TRUE, RANDOM_FACIAL_HAIR_COLOR = TRUE, RANDOM_SKIN_TONE = TRUE, RANDOM_EYE_COLOR = TRUE) - var/list/friendlyGenders = list("Male" = "male", "Female" = "female", "Other" = "plural") - var/list/prosthetic_limbs = list(BODY_ZONE_L_ARM = PROSTHETIC_NORMAL, BODY_ZONE_R_ARM = PROSTHETIC_NORMAL, BODY_ZONE_L_LEG = PROSTHETIC_NORMAL, BODY_ZONE_R_LEG = PROSTHETIC_NORMAL) + var/list/randomise = list( + RANDOM_UNDERWEAR = TRUE, + RANDOM_UNDERWEAR_COLOR = TRUE, + RANDOM_UNDERSHIRT = TRUE, + RANDOM_UNDERSHIRT_COLOR = TRUE, + RANDOM_SOCKS = TRUE, + RANDOM_SOCKS_COLOR = TRUE, + RANDOM_BACKPACK = TRUE, + RANDOM_JUMPSUIT_STYLE = TRUE, + RANDOM_EXOWEAR_STYLE = TRUE, + RANDOM_HAIRSTYLE = TRUE, + RANDOM_HAIR_COLOR = TRUE, + RANDOM_FACIAL_HAIRSTYLE = TRUE, + RANDOM_FACIAL_HAIR_COLOR = TRUE, + RANDOM_SKIN_TONE = TRUE, + RANDOM_EYE_COLOR = TRUE, + ) + var/list/friendlyGenders = list( + "Male" = "male", + "Female" = "female", + "Other" = "plural" + ) + var/list/prosthetic_limbs = list( + BODY_ZONE_L_ARM = PROSTHETIC_NORMAL, + BODY_ZONE_R_ARM = PROSTHETIC_NORMAL, + BODY_ZONE_L_LEG = PROSTHETIC_NORMAL, + BODY_ZONE_R_LEG = PROSTHETIC_NORMAL + ) + var/fbp = FALSE var/phobia = "spiders" var/list/alt_titles_preferences = list() - var/list/custom_names = list() var/preferred_ai_core_display = "Blue" var/prefered_security_department = SEC_DEPT_RANDOM @@ -195,7 +223,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) load_path(C.ckey) unlock_content = C.IsByondMember() if(unlock_content) - max_save_slots = 15 + max_save_slots = 30 var/loaded_preferences_successfully = load_preferences() if(loaded_preferences_successfully) if(load_character()) @@ -361,24 +389,27 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Always Random Species: [(randomise[RANDOM_SPECIES]) ? "Yes" : "No"]
" if(!(NO_UNDERWEAR in pref_species.species_traits)) - dat += "Underwear:
[underwear]" - dat += "[(randomise[RANDOM_UNDERWEAR]) ? "Lock" : "Unlock"]" + dat += "Underwear:
[underwear]" + dat += "[(randomise[RANDOM_UNDERWEAR]) ? "Lock" : "Unlock"]
" - dat += "
Underwear Color:
Change" - dat += "[(randomise[RANDOM_UNDERWEAR_COLOR]) ? "Lock" : "Unlock"]" + dat += "Underwear Color:
Change" + dat += "[(randomise[RANDOM_UNDERWEAR_COLOR]) ? "Lock" : "Unlock"]
" - dat += "
Undershirt:
[undershirt]" - dat += "[(randomise[RANDOM_UNDERSHIRT]) ? "Lock" : "Unlock"]" + dat += "Undershirt:
[undershirt]" + dat += "[(randomise[RANDOM_UNDERSHIRT]) ? "Lock" : "Unlock"]
" + dat += "Undershirt Color:
Change" + dat += "[(randomise[RANDOM_UNDERSHIRT_COLOR]) ? "Lock" : "Unlock"]
" - dat += "
Socks:
[socks]" - dat += "[(randomise[RANDOM_SOCKS]) ? "Lock" : "Unlock"]
" + dat += "Socks:
[socks]" + dat += "[(randomise[RANDOM_SOCKS]) ? "Lock" : "Unlock"]
" + dat += "Socks Color:
Change" + dat += "[(randomise[RANDOM_SOCKS_COLOR]) ? "Lock" : "Unlock"]" - var/use_skintones = pref_species.use_skintones - if(use_skintones) + dat += APPEARANCE_CATEGORY_COLUMN - dat += APPEARANCE_CATEGORY_COLUMN + if(pref_species.use_skintones) dat += "
Skin Tone
" @@ -386,23 +417,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[(randomise[RANDOM_SKIN_TONE]) ? "Lock" : "Unlock"]" dat += "" - var/mutant_colors - if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits)) + // Everyone gets mutant colors now. + dat += "
Mutant Colors
" - if(!use_skintones) - dat += APPEARANCE_CATEGORY_COLUMN - - dat += "Mutant Color
" - - dat += " Change" - - mutant_colors = TRUE + dat += " Change
" + dat += " Change
" if(istype(pref_species, /datum/species/ethereal)) //not the best thing to do tbf but I dont know whats better. - if(!use_skintones) - dat += APPEARANCE_CATEGORY_COLUMN - dat += "
Ethereal Color
" dat += " Change" @@ -410,16 +432,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) if((EYECOLOR in pref_species.species_traits) && !(NOEYESPRITES in pref_species.species_traits)) - if(!use_skintones && !mutant_colors) - dat += APPEARANCE_CATEGORY_COLUMN - dat += "
Eye Color
" dat += " Change" dat += "[(randomise[RANDOM_EYE_COLOR]) ? "Lock" : "Unlock"]" dat += "" - else if(use_skintones || mutant_colors) - dat += "" + + dat += "" if(HAIR in pref_species.species_traits) @@ -488,6 +507,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
Horns
" dat += "[features["horns"]]" + dat += " Change
" + dat += "[(randomise[RANDOM_HAIR_COLOR]) ? "Lock" : "Unlock"]
" mutant_category++ if(mutant_category >= MAX_MUTANT_ROWS) @@ -709,8 +730,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
Body Feathers
" dat += "[features["kepori_body_feathers"]]" - dat += " Change
" - dat += "[(randomise[RANDOM_FACIAL_HAIR_COLOR]) ? "Lock" : "Unlock"]
" + dat += " Change
" mutant_category++ if(mutant_category >= MAX_MUTANT_ROWS) @@ -723,8 +743,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
Tail Feathers
" dat += "[features["kepori_tail_feathers"]]" - dat += " Change
" - dat += "[(randomise[RANDOM_FACIAL_HAIR_COLOR]) ? "Lock" : "Unlock"]
" + dat += " Change
" mutant_category++ if(mutant_category >= MAX_MUTANT_ROWS) @@ -849,14 +868,17 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" dat += "
Prosthetic Limbs
" - dat += "Random Prosthetic: [(randomise[RANDOM_PROSTHETIC]) ? "Yes" : "No"]" + dat += "Full Body Prosthesis: [fbp ? "Yes" : "No"]
" + + if(!fbp) + dat += "Random Prosthetic: [(randomise[RANDOM_PROSTHETIC]) ? "Yes" : "No"]
" - dat += "
| [bodypart_name]: | " - dat += "[prosthetic_limbs[index]] |
" + dat += "
| [bodypart_name]: | " + dat += "[prosthetic_limbs[index]] |
" if(2) //Loadout if(path) @@ -1451,6 +1473,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(href_list["preference"] == "species") switch(href_list["task"]) + if("random") + random_species() + ShowChoices(user) + return TRUE if("close") user << browse(null, "window=mob_species") ShowChoices(user) @@ -1461,7 +1487,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) pref_species = new newtype() //Now that we changed our species, we must verify that the mutant colour is still allowed. var/temp_hsv = RGBtoHSV(features["mcolor"]) - if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#191919")[3])) + if(text2num(features["mcolor"], 16) == 0 || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#191919")[3])) features["mcolor"] = pref_species.default_color user << browse(null, "window=speciespick") ShowChoices(user) @@ -1472,7 +1498,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) species_looking_at = href_list["newspecies"] ShowSpeciesChoices(user) - return 1 + return TRUE if(href_list["preference"] == "trait") switch(href_list["task"]) @@ -1548,27 +1574,29 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("age") age = rand(pref_species.species_age_min, pref_species.species_age_max) if("hair") - hair_color = random_short_color() + hair_color = random_color_natural() if("hairstyle") hairstyle = random_hairstyle(gender) if("facial") - facial_hair_color = random_short_color() + facial_hair_color = random_color_natural() if("facial_hairstyle") facial_hairstyle = random_facial_hairstyle(gender) if("underwear") underwear = random_underwear(gender) if("underwear_color") - underwear_color = random_short_color() + underwear_color = random_color() if("undershirt") undershirt = random_undershirt(gender) + if("undershirt_color") + undershirt_color = random_short_color() if("socks") socks = random_socks() + if("socks_color") + socks_color = random_short_color() if("eyes") eye_color = random_eye_color() if("s_tone") skin_tone = random_skin_tone() - if("species") - random_species() if("bag") backpack = pick(GLOB.backpacklist) if("suit") @@ -1717,12 +1745,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("underwear") var/new_underwear - if(gender == MALE) - new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_m - else if(gender == FEMALE) - new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_f - else - new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_list + new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_list if(new_underwear) underwear = new_underwear @@ -1733,21 +1756,26 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("undershirt") var/new_undershirt - if(gender == MALE) - new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_m - else if(gender == FEMALE) - new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_f - else - new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_list + new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_list if(new_undershirt) undershirt = new_undershirt + if("undershirt_color") + var/new_undershirt_color = input(user, "Choose your character's underwear color:", "Character Preference","#"+undershirt_color) as color|null + if(new_undershirt_color) + undershirt_color = sanitize_hexcolor(new_undershirt_color) + if("socks") var/new_socks new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in GLOB.socks_list if(new_socks) socks = new_socks + if("socks_color") + var/new_socks_color = input(user, "Choose your character's underwear color:", "Character Preference","#"+socks_color) as color|null + if(new_socks_color) + socks_color = sanitize_hexcolor(new_socks_color) + if("eyes") var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null if(new_eyes) @@ -1759,7 +1787,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["body_size"] = new_size if("mutant_color") - var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null + var/new_mutantcolor = input(user, "Choose your character's primary alien/mutant color:", "Character Preference","#" + features["mcolor"]) as color|null if(new_mutantcolor) var/temp_hsv = RGBtoHSV(new_mutantcolor) if(new_mutantcolor == "#000000") @@ -1769,12 +1797,23 @@ GLOBAL_LIST_EMPTY(preferences_datums) else to_chat(user, "Invalid color. Your color is not bright enough.") + if("mutant_color_2") + var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference","#" + features["mcolor2"]) as color|null + if(new_mutantcolor) + var/temp_hsv = RGBtoHSV(new_mutantcolor) + if(new_mutantcolor == "#000000") + features["mcolor2"] = pref_species.default_color + else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#191919")[3]) // mutantcolors must be bright, but only if they affect the skin + features["mcolor2"] = sanitize_hexcolor(new_mutantcolor) + else + to_chat(user, "Invalid color. Your color is not bright enough.") + if("color_ethereal") var/new_etherealcolor = input(user, "Choose your elzuosa color:", "Character Preference","#"+features["ethcolor"]) as color|null if(new_etherealcolor) var/temp_hsv = RGBtoHSV(new_etherealcolor) if(ReadHSV(temp_hsv)[3] >= ReadHSV("#505050")[3]) // elzu colors should be bright - features["ethcolor"] = sanitize_hexcolor(new_etherealcolor, 6) + features["ethcolor"] = sanitize_hexcolor(new_etherealcolor) else to_chat(user, "Invalid color. Your color is not bright enough.") @@ -2045,6 +2084,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) facial_hairstyle = random_facial_hairstyle(gender) hairstyle = random_hairstyle(gender) + if("fbp") + fbp = !fbp + if("limbs") if(href_list["customize_limb"]) var/limb = href_list["customize_limb"] @@ -2360,7 +2402,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.underwear = underwear character.underwear_color = underwear_color character.undershirt = undershirt + character.undershirt_color = undershirt_color character.socks = socks + character.socks_color = socks_color character.backpack = backpack @@ -2368,6 +2412,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.exowear = exowear + character.fbp = fbp + character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially if(loadout) //I have been told not to do this because it's too taxing on performance, but hey, I did it anyways! //I hate you old me //don't be mean @@ -2386,36 +2432,28 @@ GLOBAL_LIST_EMPTY(preferences_datums) //prosthetics work for vox and kepori and update just fine for everyone character.dna.features = features.Copy() - character.set_species(chosen_species, icon_update = FALSE, pref_load = TRUE) - - for(var/pros_limbs in prosthetic_limbs) - var/obj/item/bodypart/old_part = character.get_bodypart(pros_limbs) - if(old_part) - icon_updates = TRUE - switch(prosthetic_limbs[pros_limbs]) - if(PROSTHETIC_NORMAL) - if(old_part) - old_part.drop_limb(TRUE) - qdel(old_part) - character.regenerate_limb(pros_limbs) - if(PROSTHETIC_AMPUTATED) - if(old_part) - old_part.drop_limb(TRUE) - qdel(old_part) - if(PROSTHETIC_ROBOTIC) - var/obj/item/bodypart/prosthetic - var/typepath - if(character.dna.species.unique_prosthesis) // Checks for if the species has a unique limb type, otherwise defaults to human - typepath = text2path("/obj/item/bodypart/[pros_limbs]/robot/surplus/[character.dna.species.id]") - else - typepath = text2path("/obj/item/bodypart/[pros_limbs]/robot/surplus") - if(!ispath(typepath)) - to_chat(character, "Problem initializing [pros_limbs] prosthetic for species [character.dna.species], it will be a normal limb. Make a bug report on github!") - continue - prosthetic = new typepath(character) - prosthetic.replace_limb(character, special = TRUE) - if(old_part) - qdel(old_part) + character.set_species(chosen_species, icon_update = FALSE, pref_load = TRUE, robotic = fbp) + + if(!fbp) + for(var/pros_limb in prosthetic_limbs) + var/obj/item/bodypart/old_part = character.get_bodypart(pros_limb) + if(old_part) + icon_updates = TRUE + switch(prosthetic_limbs[pros_limb]) + if(PROSTHETIC_NORMAL) + if(old_part) + old_part.drop_limb(TRUE) + qdel(old_part) + character.regenerate_limb(pros_limb) + if(PROSTHETIC_AMPUTATED) + if(old_part) + old_part.drop_limb(TRUE) + qdel(old_part) + if(PROSTHETIC_ROBOTIC) + if(old_part) + old_part.drop_limb(TRUE) + qdel(old_part) + character.regenerate_limb(pros_limb, robotic = TRUE) if(pref_species.id == "ipc") // If triggered, vox and kepori arms do not spawn in but ipcs sprites break without it as the code for setting the right prosthetics for them is in set_species(). character.set_species(chosen_species, icon_update = FALSE, pref_load = TRUE) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 7ee41146cffd..07458bace6aa 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -234,9 +234,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Sanitize - asaycolor = sanitize_ooccolor(sanitize_hexcolor(asaycolor, 6, 1, initial(asaycolor))) - ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, 1, initial(ooccolor))) - screentip_color = sanitize_ooccolor(sanitize_hexcolor(screentip_color, 6, 1, initial(screentip_color))) + asaycolor = sanitize_ooccolor(sanitize_hexcolor(asaycolor, 6, TRUE, initial(asaycolor))) + ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, TRUE, initial(ooccolor))) + screentip_color = sanitize_ooccolor(sanitize_hexcolor(screentip_color, 6, TRUE, initial(screentip_color))) lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog)) UI_style = sanitize_inlist(UI_style, GLOB.available_ui_styles, GLOB.available_ui_styles[1]) hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, initial(hotkeys)) @@ -267,7 +267,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car be_special = SANITIZE_LIST(be_special) show_credits = sanitize_integer(show_credits, 0, 1, initial(show_credits)) pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style)) - pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color)) + pda_color = sanitize_hexcolor(pda_color, 6, TRUE, initial(pda_color)) key_bindings = sanitize_keybindings(key_bindings) favorite_outfits = SANITIZE_LIST(favorite_outfits) equipped_gear = sanitize_each_inlist(equipped_gear, GLOB.gear_datums) @@ -395,7 +395,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["underwear"], underwear) READ_FILE(S["underwear_color"], underwear_color) READ_FILE(S["undershirt"], undershirt) + READ_FILE(S["undershirt_color"], undershirt_color) READ_FILE(S["socks"], socks) + READ_FILE(S["socks_color"], socks_color) READ_FILE(S["backpack"], backpack) READ_FILE(S["jumpsuit_style"], jumpsuit_style) READ_FILE(S["uplink_loc"], uplink_spawn_loc) @@ -405,6 +407,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["prosthetic_limbs"], prosthetic_limbs) prosthetic_limbs ||= list(BODY_ZONE_L_ARM = PROSTHETIC_NORMAL, BODY_ZONE_R_ARM = PROSTHETIC_NORMAL, BODY_ZONE_L_LEG = PROSTHETIC_NORMAL, BODY_ZONE_R_LEG = PROSTHETIC_NORMAL) READ_FILE(S["feature_mcolor"], features["mcolor"]) + READ_FILE(S["feature_mcolor2"], features["mcolor2"]) READ_FILE(S["feature_ethcolor"], features["ethcolor"]) READ_FILE(S["feature_lizard_tail"], features["tail_lizard"]) READ_FILE(S["feature_lizard_snout"], features["snout"]) @@ -445,6 +448,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["feature_human_tail"], features["tail_human"]) READ_FILE(S["feature_human_ears"], features["ears"]) + READ_FILE(S["fbp"], fbp) + //Custom names for(var/custom_name_id in GLOB.preferences_custom_names) var/savefile_slot_name = custom_name_id + "_name" //TODO remove this @@ -478,45 +483,43 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(!custom_names[custom_name_id]) custom_names[custom_name_id] = get_default_name(custom_name_id) - if(!features["mcolor"] || features["mcolor"] == "#000") - features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F") + if(!features["mcolor"] || text2num(features["mcolor"], 16) == 0) + features["mcolor"] = random_color() - if(!features["ethcolor"] || features["ethcolor"] == "#000") + if(!features["ethcolor"] || text2num(features["ethcolor"], 16) == 0) features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)] randomise = SANITIZE_LIST(randomise) if(gender == MALE) - hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_male_list) - facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list) - underwear = sanitize_inlist(underwear, GLOB.underwear_m) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_m) + hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_male_list) + facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list) else if(gender == FEMALE) - hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_female_list) - facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list) - underwear = sanitize_inlist(underwear, GLOB.underwear_f) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_f) + hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_female_list) + facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list) else - hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_list) - facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list) - underwear = sanitize_inlist(underwear, GLOB.underwear_list) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list) + hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_list) + facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list) + underwear = sanitize_inlist(underwear, GLOB.underwear_list) + undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list) socks = sanitize_inlist(socks, GLOB.socks_list) age = sanitize_integer(age, pref_species.species_age_min, pref_species.species_age_max, initial(age)) - hair_color = sanitize_hexcolor(hair_color, 3, 0) - facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0) - underwear_color = sanitize_hexcolor(underwear_color, 3, 0) - eye_color = sanitize_hexcolor(eye_color, 3, 0) + hair_color = sanitize_hexcolor(hair_color) + facial_hair_color = sanitize_hexcolor(facial_hair_color) + underwear_color = sanitize_hexcolor(underwear_color) + eye_color = sanitize_hexcolor(eye_color) skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones) backpack = sanitize_inlist(backpack, GLOB.backpacklist, initial(backpack)) jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style)) exowear = sanitize_inlist(exowear, GLOB.exowearlist, initial(exowear)) uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc)) + fbp = sanitize_integer(fbp, FALSE, TRUE, FALSE) features["grad_style"] = sanitize_inlist(features["grad_style"], GLOB.hair_gradients_list) - features["grad_color"] = sanitize_hexcolor(features["grad_color"], 3, 0) + features["grad_color"] = sanitize_hexcolor(features["grad_color"]) features["body_size"] = sanitize_inlist(features["body_size"], GLOB.body_sizes, "Normal") - features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0) + features["mcolor"] = sanitize_hexcolor(features["mcolor"]) + features["mcolor2"] = sanitize_hexcolor(features["mcolor2"]) features["ethcolor"] = copytext_char(features["ethcolor"], 1, 7) features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard) features["tail_human"] = sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None") @@ -548,6 +551,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car features["flavor_text"] = sanitize_text(features["flavor_text"], initial(features["flavor_text"])) all_quirks = SANITIZE_LIST(all_quirks) + //Make sure all quirks are compatible check_quirk_compatibility() @@ -561,50 +565,50 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car return FALSE S.cd = "/character[default_slot]" - WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //load_character will sanitize any bad data, so assume up-to-date.) + WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //load_character will sanitize any bad data, so assume up-to-date.) //Character - WRITE_FILE(S["real_name"] , real_name) - WRITE_FILE(S["gender"] , gender) - WRITE_FILE(S["age"] , age) - WRITE_FILE(S["hair_color"] , hair_color) + WRITE_FILE(S["real_name"] , real_name) + WRITE_FILE(S["gender"] , gender) + WRITE_FILE(S["age"] , age) + WRITE_FILE(S["hair_color"] , hair_color) WRITE_FILE(S["facial_hair_color"] , facial_hair_color) - WRITE_FILE(S["feature_grad_color"] , features["grad_color"]) - WRITE_FILE(S["eye_color"] , eye_color) - WRITE_FILE(S["skin_tone"] , skin_tone) - WRITE_FILE(S["hairstyle_name"] , hairstyle) + WRITE_FILE(S["feature_grad_color"] , features["grad_color"]) + WRITE_FILE(S["eye_color"] , eye_color) + WRITE_FILE(S["skin_tone"] , skin_tone) + WRITE_FILE(S["hairstyle_name"] , hairstyle) WRITE_FILE(S["facial_style_name"] , facial_hairstyle) - WRITE_FILE(S["feature_grad_style"] , features["grad_style"]) - WRITE_FILE(S["underwear"] , underwear) - WRITE_FILE(S["underwear_color"] , underwear_color) - WRITE_FILE(S["undershirt"] , undershirt) - WRITE_FILE(S["socks"] , socks) - WRITE_FILE(S["backpack"] , backpack) - WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc) - WRITE_FILE(S["randomise"] , randomise) - WRITE_FILE(S["species"] , pref_species.id) - WRITE_FILE(S["phobia"], phobia) - WRITE_FILE(S["body_size"] , features["body_size"]) - WRITE_FILE(S["prosthetic_limbs"], prosthetic_limbs) - WRITE_FILE(S["feature_mcolor"] , features["mcolor"]) - WRITE_FILE(S["feature_ethcolor"] , features["ethcolor"]) + WRITE_FILE(S["feature_grad_style"] , features["grad_style"]) + WRITE_FILE(S["underwear"] , underwear) + WRITE_FILE(S["underwear_color"] , underwear_color) + WRITE_FILE(S["undershirt"] , undershirt) + WRITE_FILE(S["undershirt_color"] , undershirt_color) + WRITE_FILE(S["socks"] , socks) + WRITE_FILE(S["socks_color"] , socks_color) + WRITE_FILE(S["backpack"] , backpack) + WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc) + WRITE_FILE(S["randomise"] , randomise) + WRITE_FILE(S["species"] , pref_species.id) + WRITE_FILE(S["phobia"] , phobia) + WRITE_FILE(S["body_size"] , features["body_size"]) + WRITE_FILE(S["prosthetic_limbs"] , prosthetic_limbs) + WRITE_FILE(S["feature_mcolor"] , features["mcolor"]) + WRITE_FILE(S["feature_mcolor2"] , features["mcolor2"]) + WRITE_FILE(S["feature_ethcolor"] , features["ethcolor"]) WRITE_FILE(S["feature_lizard_tail"] , features["tail_lizard"]) - WRITE_FILE(S["feature_human_tail"] , features["tail_human"]) - WRITE_FILE(S["feature_lizard_snout"] , features["snout"]) - WRITE_FILE(S["feature_lizard_horns"] , features["horns"]) - WRITE_FILE(S["feature_human_ears"] , features["ears"]) - WRITE_FILE(S["feature_lizard_frills"] , features["frills"]) - WRITE_FILE(S["feature_lizard_spines"] , features["spines"]) - WRITE_FILE(S["feature_lizard_body_markings"] , features["body_markings"]) + WRITE_FILE(S["feature_human_tail"] , features["tail_human"]) + WRITE_FILE(S["feature_lizard_snout"] , features["snout"]) + WRITE_FILE(S["feature_lizard_horns"] , features["horns"]) + WRITE_FILE(S["feature_human_ears"] , features["ears"]) + WRITE_FILE(S["feature_lizard_frills"] , features["frills"]) + WRITE_FILE(S["feature_lizard_spines"] , features["spines"]) + WRITE_FILE(S["feature_lizard_body_markings"], features["body_markings"]) WRITE_FILE(S["feature_lizard_legs"] , features["legs"]) WRITE_FILE(S["feature_moth_wings"] , features["moth_wings"]) WRITE_FILE(S["feature_moth_markings"] , features["moth_markings"]) - - //WS begin WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style) WRITE_FILE(S["exowear"] , exowear) WRITE_FILE(S["equipped_gear"] , equipped_gear) - WRITE_FILE(S["feature_moth_fluff"] , features["moth_fluff"]) WRITE_FILE(S["feature_spider_legs"] , features["spider_legs"]) WRITE_FILE(S["feature_spider_spinneret"] , features["spider_spinneret"]) @@ -614,32 +618,29 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["feature_ipc_antenna"] , features["ipc_antenna"]) WRITE_FILE(S["feature_ipc_chassis"] , features["ipc_chassis"]) WRITE_FILE(S["feature_ipc_brain"] , features["ipc_brain"]) - WRITE_FILE(S["feature_kepori_feathers"] , features["kepori_feathers"]) + WRITE_FILE(S["feature_kepori_feathers"] , features["kepori_feathers"]) WRITE_FILE(S["feature_kepori_body_feathers"], features["kepori_body_feathers"]) WRITE_FILE(S["feature_kepori_tail_feathers"], features["kepori_tail_feathers"]) - WRITE_FILE(S["feature_vox_head_quills"], features["vox_head_quills"]) - WRITE_FILE(S["feature_vox_neck_quills"], features["vox_neck_quills"]) + WRITE_FILE(S["feature_vox_head_quills"] , features["vox_head_quills"]) + WRITE_FILE(S["feature_vox_neck_quills"] , features["vox_neck_quills"]) WRITE_FILE(S["feature_elzu_horns"] , features["elzu_horns"]) WRITE_FILE(S["feature_tail_elzu"] , features["tail_elzu"]) + WRITE_FILE(S["fbp"] , fbp) //Flavor text - WRITE_FILE(S["feature_flavor_text"], features["flavor_text"]) - - //WS End - + WRITE_FILE(S["feature_flavor_text"] , features["flavor_text"]) //Custom names for(var/custom_name_id in GLOB.preferences_custom_names) var/savefile_slot_name = custom_name_id + "_name" //TODO remove this - WRITE_FILE(S[savefile_slot_name],custom_names[custom_name_id]) - - WRITE_FILE(S["preferred_ai_core_display"] , preferred_ai_core_display) - WRITE_FILE(S["prefered_security_department"] , prefered_security_department) - + WRITE_FILE(S[savefile_slot_name] ,custom_names[custom_name_id]) + //AI cores + WRITE_FILE(S["preferred_ai_core_display"] , preferred_ai_core_display) + //Deprecated department security stuff + WRITE_FILE(S["prefered_security_department"], prefered_security_department) //Preview outfit selection - WRITE_FILE(S["selected_outfit"], selected_outfit) - + WRITE_FILE(S["selected_outfit"] , selected_outfit) //Quirks - WRITE_FILE(S["all_quirks"] , all_quirks) + WRITE_FILE(S["all_quirks"] , all_quirks) return TRUE diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 9a90d6b750b7..9c70b89c2924 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -284,13 +284,6 @@ * BLIND // can't see anything */ -/proc/generate_female_clothing(index,t_color,icon,type) - var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"=t_color) - var/icon/female_s = icon("icon"='icons/mob/clothing/under/masking_helpers.dmi', "icon_state"="[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]") - female_clothing_icon.Blend(female_s, ICON_MULTIPLY) - female_clothing_icon = fcopy_rsc(female_clothing_icon) - GLOB.female_clothing_icons[index] = female_clothing_icon - /obj/item/proc/generate_species_clothing(file2use, state2use, layer, datum/species/mob_species) if(!icon_exists(file2use, state2use)) return diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 5d446fd90329..118a8ded5587 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -9,6 +9,7 @@ equip_delay_other = 25 resistance_flags = NONE custom_materials = list(/datum/material/glass = 250) + supports_variations = VOX_VARIATION greyscale_colors = list(list(14, 26), list(17, 26)) greyscale_icon_state = "glasses" var/vision_flags = 0 @@ -103,6 +104,7 @@ resistance_flags = ACID_PROOF armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) custom_price = 250 + supports_variations = VOX_VARIATION /obj/item/clothing/glasses/science/item_action_slot_check(slot) if(slot == ITEM_SLOT_EYES) @@ -128,6 +130,7 @@ flash_protect = FLASH_PROTECTION_SENSITIVE lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE glass_colour_type = /datum/client_colour/glass_colour/green + supports_variations = VOX_VARIATION /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) user.visible_message("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") @@ -144,6 +147,7 @@ desc = "Such a dapper eyepiece!" icon_state = "monocle" item_state = "headset" // lol + supports_variations = VOX_VARIATION /obj/item/clothing/glasses/material name = "optical material scanner" @@ -177,6 +181,7 @@ icon_state = "glasses" item_state = "glasses" vision_correction = 1 //corrects nearsightedness + supports_variations = VOX_VARIATION /obj/item/clothing/glasses/regular/jamjar name = "jamjar glasses" @@ -208,6 +213,7 @@ tint = 1 glass_colour_type = /datum/client_colour/glass_colour/gray dog_fashion = /datum/dog_fashion/head + supports_variations = VOX_VARIATION /obj/item/clothing/glasses/sunglasses/reagent name = "beer goggles" @@ -284,6 +290,7 @@ visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT flags_cover = GLASSESCOVERSEYES glass_colour_type = /datum/client_colour/glass_colour/gray + supports_variations = VOX_VARIATION /obj/item/clothing/glasses/welding/attack_self(mob/user) weldingvisortoggle(user) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 92cfb0f82547..fb39c86a8369 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -6,7 +6,6 @@ ///Used for topic calls. Just because you have a HUD display doesn't mean you should be able to interact with stuff. var/hud_trait = null - /obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot) ..() if(slot != ITEM_SLOT_EYES) diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index a76ff7c5834d..807bfb217516 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -5,6 +5,7 @@ item_state = "boxing" equip_delay_other = 60 species_exception = list(/datum/species/golem) // now you too can be a golem boxing champion + supports_variations = VOX_VARIATION /obj/item/clothing/gloves/boxing/green icon_state = "boxinggreen" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index d4acfb288100..9aa60648ea0a 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -1,5 +1,6 @@ /obj/item/clothing/gloves/color dying_key = DYE_REGISTRY_GLOVES + supports_variations = VOX_VARIATION /obj/item/clothing/gloves/color/yellow desc = "These gloves provide protection against electric shock." diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 39e2d3e6059b..bde02cd7d64d 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -226,7 +226,7 @@ icon_state = "hair_vlong" item_state = "pwig" flags_inv = HIDEHAIR - color = "#000" + color = "#000000" var/hairstyle = "Very Long Hair" var/adjustablecolor = TRUE //can color be changed manually? @@ -276,13 +276,13 @@ /obj/item/clothing/head/wig/random/Initialize(mapload) hairstyle = pick(GLOB.hairstyles_list - "Bald") //Don't want invisible wig - add_atom_colour("#[random_short_color()]", FIXED_COLOUR_PRIORITY) + add_atom_colour("#[random_color_natural()]", FIXED_COLOUR_PRIORITY) . = ..() /obj/item/clothing/head/wig/natural name = "natural wig" desc = "A bunch of hair without a head attached. This one changes color to match the hair of the wearer. Nothing natural about that." - color = "#FFF" + color = "#FFFFFF" adjustablecolor = FALSE custom_price = 100 diff --git a/code/modules/clothing/outfits/solgov.dm b/code/modules/clothing/outfits/solgov.dm index 650afea02bc2..d8a695908113 100644 --- a/code/modules/clothing/outfits/solgov.dm +++ b/code/modules/clothing/outfits/solgov.dm @@ -39,7 +39,7 @@ id = /obj/item/card/id/gold belt = /obj/item/pda/captain gloves = /obj/item/clothing/gloves/combat - ears = /obj/item/radio/headset/solgov + ears = /obj/item/radio/headset/solgov/alt/captain uniform = /obj/item/clothing/under/solgov/formal/captain suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain shoes = /obj/item/clothing/shoes/laceup @@ -62,7 +62,7 @@ id = /obj/item/card/id/solgov uniform = /obj/item/clothing/under/solgov suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov - ears = /obj/item/radio/headset/solgov + ears = /obj/item/radio/headset/solgov/alt gloves = /obj/item/clothing/gloves/combat head = /obj/item/clothing/head/solgov/sonnensoldner r_pocket = /obj/item/gun/ballistic/automatic/pistol/solgov @@ -89,7 +89,7 @@ dcoat = /obj/item/clothing/suit/hooded/wintercoat gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/laceup - ears = /obj/item/radio/headset/solgov + ears = /obj/item/radio/headset/solgov/captain glasses = /obj/item/clothing/glasses/sunglasses belt = /obj/item/pda/solgov @@ -105,7 +105,7 @@ id = /obj/item/card/id/solgov belt = /obj/item/pda/heads/head_of_personnel - ears = /obj/item/radio/headset/solgov + ears = /obj/item/radio/headset/solgov/captain uniform = /obj/item/clothing/under/solgov/formal head = /obj/item/clothing/head/solgov neck = /obj/item/clothing/neck/cloak/overseer diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 369868456601..78364599dee9 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -9,6 +9,7 @@ slot_flags = ITEM_SLOT_FEET greyscale_colors = list(list(13, 3), list(14, 2), list(12, 2)) greyscale_icon_state = "shoes" + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION permeability_coefficient = 0.5 slowdown = SHOES_SLOWDOWN diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 7fe8016b0ed2..a348fa398d82 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -1,6 +1,6 @@ /obj/item/clothing/shoes/sneakers dying_key = DYE_REGISTRY_SNEAKERS - supports_variations = DIGITIGRADE_VARIATION + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION /obj/item/clothing/shoes/sneakers/black name = "black shoes" @@ -46,7 +46,7 @@ /obj/item/clothing/shoes/sneakers/rainbow name = "rainbow shoes" - desc = "Very gay shoes." + desc = "Very colorful shoes." icon_state = "rain_bow" /obj/item/clothing/shoes/sneakers/orange diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 9cb9aa5b9cd4..6bb64c2caebb 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -10,7 +10,7 @@ strip_delay = 70 equip_delay_other = 70 resistance_flags = FIRE_PROOF - supports_variations = DIGITIGRADE_VARIATION + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION greyscale_icon_state = "boots" /obj/item/clothing/shoes/magboots/verb/toggle() diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index db39f7c6683a..fc408334e846 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -13,7 +13,6 @@ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50) - supports_variations = DIGITIGRADE_VARIATION strip_delay = 40 resistance_flags = NONE permeability_coefficient = 0.05 //Thick soles, and covers the ankle @@ -150,7 +149,6 @@ permeability_coefficient = 0.05 //Thick soles, and covers the ankle pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes can_be_tied = FALSE - supports_variations = DIGITIGRADE_VARIATION greyscale_icon_state = "boots" /obj/item/clothing/shoes/jackboots/fast @@ -168,7 +166,6 @@ max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes lace_time = 8 SECONDS - supports_variations = DIGITIGRADE_VARIATION greyscale_icon_state = "boots" /obj/item/clothing/shoes/workboots @@ -183,7 +180,6 @@ equip_delay_other = 40 pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes lace_time = 8 SECONDS - supports_variations = DIGITIGRADE_VARIATION greyscale_icon_state = "boots" /obj/item/clothing/shoes/winterboots/ice_boots diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 081c7f7f50b3..e6ff7a1a15b5 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -100,14 +100,14 @@ item_state = "eng_hardsuit" max_integrity = 300 armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75) - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/environmental_regulator) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser) siemens_coefficient = 0 var/obj/item/clothing/head/helmet/space/hardsuit/helmet - actions_types = list(/datum/action/item_action/toggle_helmet) //WS Edit - No Cells in EVA suits + actions_types = list(/datum/action/item_action/toggle_helmet) var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit var/obj/item/tank/jetpack/suit/jetpack = null var/hardsuit_type - pocket_storage_component_path = FALSE //WS Edit - Exowear Pockets + pocket_storage_component_path = FALSE greyscale_colors = list(list(11, 19), list(22, 12), list(16, 9)) greyscale_icon_state = "hardsuit" @@ -205,7 +205,7 @@ icon_state = "hardsuit-engineering" item_state = "eng_hardsuit" armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75) - supports_variations = DIGITIGRADE_VARIATION + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine resistance_flags = FIRE_PROOF @@ -265,7 +265,7 @@ heat_protection = HEAD armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 75) light_range = 7 - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/environmental_regulator) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator) /obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize() . = ..() @@ -279,7 +279,7 @@ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 75) - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe, /obj/item/environmental_regulator) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS custom_price = 2000 @@ -298,7 +298,7 @@ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF armor = list("melee" = 35, "bullet" = 15, "laser" = 25, "energy" = 25, "bomb" = 55, "bio" = 100, "rad" = 85, "fire" = 85, "acid" = 100) - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe, /obj/item/environmental_regulator) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining/heavy custom_price = 4500 slowdown = 0.5 @@ -410,7 +410,7 @@ hardsuit_type = "syndi" w_class = WEIGHT_CLASS_NORMAL armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) - allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/environmental_regulator) + allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi jetpack = /obj/item/tank/jetpack/suit supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION @@ -519,7 +519,7 @@ w_class = WEIGHT_CLASS_NORMAL resistance_flags = FIRE_PROOF | ACID_PROOF armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) - allowed = list(/obj/item/teleportation_scroll, /obj/item/tank/internals, /obj/item/environmental_regulator) + allowed = list(/obj/item/teleportation_scroll, /obj/item/tank/internals) heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard @@ -545,7 +545,7 @@ desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement." icon_state = "hardsuit-medical" item_state = "medical_hardsuit" - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical, /obj/item/environmental_regulator) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical) armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical slowdown = 0.5 @@ -605,8 +605,11 @@ item_state = "hardsuit-rd" resistance_flags = ACID_PROOF | FIRE_PROOF max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT //Same as an emergency firesuit. Not ideal for extended exposure. - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun/energy/wormhole_projector, - /obj/item/hand_tele, /obj/item/aicard, /obj/item/environmental_regulator) + allowed = list(/obj/item/flashlight, + /obj/item/tank/internals, + /obj/item/gun/energy/wormhole_projector, + /obj/item/hand_tele, + /obj/item/aicard) armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION @@ -898,7 +901,7 @@ item_state = "syndie_hardsuit" hardsuit_type = "syndi" armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) - allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/environmental_regulator) + allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi slowdown = 0 shield_state = "shield-red" @@ -1009,6 +1012,7 @@ item_state = "independent_sec_helm" hardsuit_type = "independent-sec" armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) + supports_variations = VOX_VARIATION /obj/item/clothing/head/helmet/space/hardsuit/security/independent/frontier name = "\improper Frontiersmen hardsuit helmet" @@ -1031,6 +1035,7 @@ hardsuit_type = "independent-sec" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent armor = list("melee" = 35, "bullet" = 25, "laser" = 20, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) + supports_variations = VOX_VARIATION /obj/item/clothing/suit/space/hardsuit/security/independent/frontier name = "\improper Frontiersmen hardsuit" diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index fce9d2eeed46..4bdafe4f7f41 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -5,6 +5,7 @@ item_state = "syndicate" desc = "An advanced, lightweight space helmet made of durable composites. Almost matches integrated hardsuit helmets for protection. Almost." armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75) + supports_variations = VOX_VARIATION /obj/item/clothing/suit/space/syndicate name = "red space suit" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 6f2b83ed1e24..9002b5060c20 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -45,6 +45,7 @@ min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS resistance_flags = FIRE_PROOF | ACID_PROOF + supports_variations = VOX_VARIATION /obj/item/clothing/suit/armor/vest/marine/medium name = "medium tactical armor vest" @@ -158,6 +159,7 @@ desc = "A long, commanding coat worn over a surprisingly sleek set of armor and decorated with gold embroidery. Ideal for protecting its wearer from rain, sun, dust, mutineers, pirates, bears, hordes of angry legions, and so on." icon_state = "carapace_duster" item_state = "duster_captain" + supports_variations = VOX_VARIATION /obj/item/clothing/suit/armor/riot name = "riot suit" @@ -343,6 +345,7 @@ desc = "A shortened brown labcoat with an armor vest under it, for the IRMG's support division Corpsmen." icon_state = "armor_inteq_labcoat" item_state = "inteq_labcoat" + supports_variations = VOX_VARIATION allowed = list( /obj/item/analyzer, /obj/item/stack/medical, diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm new file mode 100644 index 000000000000..77f1f9cccae4 --- /dev/null +++ b/code/modules/clothing/suits/hoodies.dm @@ -0,0 +1,74 @@ +/obj/item/clothing/suit/hooded/hoodie/ + name = "hoodie" + desc = "HOW" + hoodtype = /obj/item/clothing/head/hooded/hood/ + body_parts_covered = CHEST|ARMS + pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large + allowed = list( /obj/item/flashlight, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/toy, + /obj/item/storage/fancy/cigarettes, + /obj/item/lighter, + /obj/item/radio, + ) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //it's just a hoodie. + +/obj/item/clothing/head/hooded/hood/ + name = "hood" + desc = "HOW" + body_parts_covered = HEAD + flags_inv = HIDEHAIR|HIDEEARS + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //it's just a hoodie. + +/obj/item/clothing/suit/hooded/hoodie/black + name = "black hoodie" + desc = "A hoodie that is black. It has a comfy pocket for keeping your hands warm." + icon_state = "hoodie_black" + item_state = "hoodie_black" + hoodtype = /obj/item/clothing/head/hooded/hood/black + +/obj/item/clothing/head/hooded/hood/black + name = "black hood" + desc = "A black hood for your black hoodie." + icon_state = "hoodie_black" + item_state = "hoodie_black" + +/obj/item/clothing/suit/hooded/hoodie/red + name = "red hoodie" + desc = "A hoodie that is red. It has a comfy pocket for keeping your hands warm." + icon_state = "hoodie_red" + item_state = "hoodie_red" + hoodtype = /obj/item/clothing/head/hooded/hood/red + +/obj/item/clothing/head/hooded/hood/red + name = "red hood" + desc = "A red hood for your red hoodie." + icon_state = "hoodie_red" + item_state = "hoodie_red" + +/obj/item/clothing/suit/hooded/hoodie/blue + name = "blue hoodie" + desc = "A hoodie that is blue. It has a comfy pocket for keeping your hands warm." + icon_state = "hoodie_blue" + item_state = "hoodie_blue" + hoodtype = /obj/item/clothing/head/hooded/hood/blue + +/obj/item/clothing/head/hooded/hood/blue + name = "blue hood" + desc = "A blue hood for your blue hoodie." + icon_state = "hoodie_blue" + item_state = "hoodie_blue" + +/obj/item/clothing/suit/hooded/hoodie/gray + name = "gray hoodie" + desc = "A hoodie that is gray. It has a comfy pocket for keeping your hands warm." + icon_state = "hoodie_gray" + item_state = "hoodie_gray" + hoodtype = /obj/item/clothing/head/hooded/hood/gray + +/obj/item/clothing/head/hooded/hood/gray + name = "gray hood" + desc = "A gray hood for your gray hoodie." + icon_state = "hoodie_gray" + item_state = "hoodie_gray" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 3b0bfb8d5567..ceac4c8ee8e3 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -422,6 +422,7 @@ item_state = "duster" heat_protection = CHEST|GROIN|ARMS|LEGS cold_protection = CHEST|GROIN|ARMS|LEGS + supports_variations = VOX_VARIATION /obj/item/clothing/suit/jacket/leather/duster/command name = "officer's duster" diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index bcf4afdc146d..9379f52314df 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -6,7 +6,7 @@ actions_types = list(/datum/action/item_action/toggle_hood) var/obj/item/clothing/head/hooded/hood var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this - pocket_storage_component_path = FALSE //WS Edit - Exowear Pockets + pocket_storage_component_path = FALSE /obj/item/clothing/suit/hooded/Initialize() . = ..() diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 739f880f7b30..5a1810e1fba1 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -131,6 +131,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 + supports_variations = VOX_VARIATION /obj/item/clothing/suit/radiation name = "radiation suit" @@ -152,6 +153,7 @@ flags_inv = HIDEJUMPSUIT resistance_flags = NONE flags_1 = RAD_PROTECT_CONTENTS_1 + supports_variations = VOX_VARIATION /obj/item/clothing/head/radiation/space name = "low-pressure radiation helmet" diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 57f259b93d29..356bef71acac 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -22,7 +22,6 @@ var/obj/item/clothing/accessory/attached_accessory var/mutable_appearance/accessory_overlay var/freshly_laundered = FALSE - supports_variations = VOX_VARIATION /obj/item/clothing/under/worn_overlays(isinhands = FALSE) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 5e5af048a0c8..1a2cfdd33fd7 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -7,7 +7,7 @@ /obj/item/clothing/under/color/jumpskirt body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE + can_adjust = TRUE /obj/item/clothing/under/color/random icon_state = "random_jumpsuit" @@ -161,7 +161,6 @@ icon_state = "teal_skirt" item_state = "b_suit" - /obj/item/clothing/under/color/lightpurple name = "purple jumpsuit" icon_state = "lightpurple" diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 8c32847380b1..a91ea7c13c67 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -1,6 +1,7 @@ /obj/item/clothing/under/rank/medical icon = 'icons/obj/clothing/under/medical.dmi' mob_overlay_icon = 'icons/mob/clothing/under/medical.dmi' + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION /obj/item/clothing/under/rank/medical/chief_medical_officer desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." @@ -22,8 +23,8 @@ /obj/item/clothing/under/rank/medical/geneticist desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." name = "geneticist's jumpsuit" - icon = 'icons/obj/clothing/under/rnd.dmi' //WS Edit - Gen/Sci Split - mob_overlay_icon = 'icons/mob/clothing/under/rnd.dmi' //WS Edit - Gen/Sci Split + icon = 'icons/obj/clothing/under/rnd.dmi' + mob_overlay_icon = 'icons/mob/clothing/under/rnd.dmi' icon_state = "genetics" item_state = "w_suit" permeability_coefficient = 0.5 @@ -49,7 +50,7 @@ /obj/item/clothing/under/rank/medical/virologist/skirt name = "virologist's jumpskirt" desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." - icon_state = "virologywhite_skirt" + icon_state = "virology_skirt" item_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE @@ -92,13 +93,18 @@ icon_state = "scrubspurple" can_adjust = FALSE +/obj/item/clothing/under/rank/medical/doctor/red + name = "medical scrubs" + desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark red." + icon_state = "scrubsred" + can_adjust = FALSE + /obj/item/clothing/under/rank/medical/doctor/skirt name = "medical doctor's jumpskirt" desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." icon_state = "medical_skirt" item_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION /obj/item/clothing/under/rank/medical/chemist @@ -115,7 +121,6 @@ icon_state = "chemistrywhite_skirt" item_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION /obj/item/clothing/under/rank/medical/paramedic @@ -125,7 +130,6 @@ item_state = "w_suit" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) - supports_variations = DIGITIGRADE_VARIATION /obj/item/clothing/under/rank/medical/paramedic/skirt name = "paramedic jumpskirt" @@ -133,155 +137,15 @@ icon_state = "paramedic_skirt" item_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = TRUE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -//Alt job uniforms - -/obj/item/clothing/under/rank/medical/chemist/pharmacist - name = "pharmacist's jumpsuit" - desc = "It's made of a special fiber that gives special protection against biohazards. For those pharmacists that want to improve or worsen their crew's health." - icon_state = "pharmacist" - -/obj/item/clothing/under/rank/medical/chemist/pharmacist/skirt - name = "pharmacist's jumpskirt" - icon_state = "pharmacist_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/rank/medical/chemist/pharmacologist - name = "pharmacologist's jumpsuit" - desc = "It's made of a special fiber that gives special protection against biohazards. For those pharmacologist one step behind to being evil." - icon_state = "pharmacologist" - -/obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt - name = "pharmacologist's jumpskirt" - icon_state = "pharmacologist_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/rank/medical/chemist/junior_chemist - name = "junior chemist's jumpsuit" - desc = "It's made of a special fiber that gives special protection against biohazards. A jumpsuit for junior chemist staff." - icon_state = "junior_chemistry" - -/obj/item/clothing/under/rank/medical/chemist/junior_chemist/skirt - name = "junior chemist's jumpskirt" - desc = "It's made of a special fiber that gives special protection against biohazards. A jumpskirt for junior chemist staff." - icon_state = "junior_chemistry_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION /obj/item/clothing/under/rank/medical/psychiatrist name = "white psychiatrist's suit" desc = "A turtleneck for personnel trained to deal with psychological issues, such as terrible work place incidents or the clown's bad jokes. This one has a white turtleneck." icon_state = "psychiatrist-white" - - can_adjust = FALSE - - permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) - -/obj/item/clothing/under/rank/medical/psychiatrist/green - name = "blue psychiatrist's suit" - desc = "A turtleneck for personnel trained to deal with psychological issues, such as terrible work place incidents or the clown's bad jokes. This one has a green turtleneck." - icon_state = "psychiatrist-green" - -/obj/item/clothing/under/rank/medical/psychiatrist/blue - name = "green psychiatrist's suit" - desc = "A turtleneck for personnel trained to deal with psychological issues, such as terrible work place incidents or the clown's bad jokes. This one has a blue turtleneck." - icon_state = "psychiatrist-blue" - -/obj/item/clothing/under/rank/medical/doctor/junior_doctor - name = "junior doctor's jumpsuit" - desc = "It's made of a special fiber that provides minor protection against biohazards. Worn by the junior medical personnel." - icon_state = "junior_medical" - -/obj/item/clothing/under/rank/medical/doctor/junior_doctor/skirt - name = "junior doctor's jumpskirt" - icon_state = "junior_medical_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/suit/cmo - name = "medical director suit" - desc = "A suit with medical colors, meant to be worn by those who lead the medical department." - icon_state = "medical_director" - permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) - icon = 'icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'icons/mob/clothing/under/medical.dmi' - -/obj/item/clothing/under/suit/cmo/skirt - name = "medical director skirtsuit" - desc = "A skirtsuit with medical colors, meant to be worn by those who lead the medical department." - icon_state = "medical_director_skirt" - - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/rank/medical/chief_medical_officer/surgeon_general - name = "surgeon-general scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards. This one is meant to be worn by surgeon-generals." - icon_state = "surgeon_general" can_adjust = FALSE - -/obj/item/clothing/under/suit/senior_doctor - name = "senior doctor suit" - desc = "A suit with medical colors, meant to be worn by senior staff." - icon_state = "senior_medical" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) - icon = 'icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'icons/mob/clothing/under/medical.dmi' - -/obj/item/clothing/under/suit/senior_doctor/skirt - name = "senior doctor skirtsuit" - desc = "A skirtsuit with medical colors, meant to be worn by senior staff." - icon_state = "senior_medical_skirt" - - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/suit/senior_chemist - name = "senior chemist suit" - desc = "A suit with chemistry colors, meant to be worn by senior staff." - icon_state = "senior_chemistry" - permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65) - icon = 'icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'icons/mob/clothing/under/medical.dmi' - -/obj/item/clothing/under/suit/senior_chemist/skirt - name = "senior chemist suit" - desc = "A skirtsuit with chemistry colors, meant to be worn by senior staff." - icon_state = "senior_chemistry_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/suit/pathologist - name = "pathologist suit" - desc = "A suit with special fibers that provide minor protection against biohazards. A suit with green pants, provided to pathologists." - icon_state = "pathologist" - permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) - icon = 'icons/obj/clothing/under/medical.dmi' - mob_overlay_icon = 'icons/mob/clothing/under/medical.dmi' - -/obj/item/clothing/under/suit/pathologist/skirt - name = "pathologist suit" - desc = "A suit with special fibers that provide minor protection against biohazards. A skirtsuit with green pants, provided to pathologists." - icon_state = "pathologist_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION /obj/item/clothing/under/rank/medical/paramedic/emt name = "emergency medical technician jumpsuit" @@ -293,11 +157,4 @@ name = "emergency medical technician jumpskirt" desc = "It's made of a special fiber that provides minor protection against biohazards." icon_state = "emt_skirt" - can_adjust = FALSE supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/rank/medical/doctor/red - name = "medical scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in red." - icon_state = "scrubsred" - can_adjust = FALSE diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 4e36715edf71..0f5472a80407 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -34,7 +34,7 @@ desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt." icon_state = "security_skirt" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/officer/nt name = "red security jumpsuit" @@ -47,7 +47,7 @@ desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt." icon_state = "rsecurity_skirt" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON // Detective// /obj/item/clothing/under/rank/security/detective @@ -66,7 +66,7 @@ desc = "Someone who wears this means business." icon_state = "detective_skirt" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/detective/grey name = "noir suit" @@ -80,7 +80,7 @@ desc = "A hard-boiled private investigator's grey suitskirt, complete with tie clip." icon_state = "greydet_skirt" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON // Brig Physician // /obj/item/clothing/under/rank/security/brig_phys @@ -94,7 +94,7 @@ icon_state = "brig_phys_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/brig_phys/nt name = "security medic's uniform" @@ -107,7 +107,7 @@ desc = "A lightly armored uniform, with a skirt, worn by medics ensuring the health of prisoners." icon_state = "rbrig_phys_skirt" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON // Warden // /obj/item/clothing/under/rank/security/warden @@ -125,7 +125,7 @@ desc = "A formal security suitskirt for wardens." icon_state = "warden_skirt" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/warden/nt name = "warden's red security suit" @@ -139,7 +139,7 @@ icon_state = "rwarden_skirt" item_state = "r_suit" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/head_of_security/nt name = "red head of security's jumpsuit" @@ -151,7 +151,7 @@ desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security." icon_state = "rhos_skirt" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON // Head of Security // /obj/item/clothing/under/rank/security/head_of_security @@ -170,7 +170,7 @@ icon_state = "hos_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/head_of_security/alt name = "head of security's turtleneck" @@ -184,7 +184,7 @@ icon_state = "hosalt_skirt" item_state = "bl_suit" body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/security/head_of_security/parade name = "head of security's parade uniform" @@ -217,7 +217,7 @@ item_state = "o_suit" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/prisoner/protected_custody name = "protected custody jumpsuit" @@ -228,7 +228,7 @@ name = "protected custody jumpskirt" desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "protected_custody_skirt" - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON // Non-official // /obj/item/clothing/under/rank/security/constable diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 086b2fc468ad..23800bf4a799 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -16,7 +16,7 @@ /obj/item/clothing/under/pants/mustangjeans name = "Must Hang jeans" desc = "Made in the finest space jeans factory this side of Alpha Centauri." - icon_state = "jeansmustang" + icon_state = "jeans" custom_price = 180 /obj/item/clothing/under/pants/blackjeans @@ -27,7 +27,7 @@ /obj/item/clothing/under/pants/youngfolksjeans name = "Young Folks jeans" desc = "For those tired of boring old jeans. Relive the passion of your youth!" - icon_state = "jeansyoungfolks" + icon_state = "jeansclassic" /obj/item/clothing/under/pants/white name = "white pants" @@ -47,7 +47,7 @@ /obj/item/clothing/under/pants/tan name = "tan pants" desc = "Some tan pants. You look like a white collar worker with these on." - icon_state = "tanpants" + icon_state = "khaki" /obj/item/clothing/under/pants/track name = "track pants" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 9ed18c18c04d..0d0a9baece0a 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -43,7 +43,7 @@ icon_state = "tactifool" item_state = "bl_suit" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) - supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION /obj/item/clothing/under/syndicate/tacticool/skirt name = "tacticool skirtleneck" @@ -52,7 +52,7 @@ item_state = "bl_suit" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | KEPORI_VARIATION /obj/item/clothing/under/syndicate/sniper name = "Tactical turtleneck suit" @@ -249,7 +249,7 @@ name = "inteq artificer overalls" desc = "A black set of overalls atop a standard issue turtleneck, for the IRMG's support division Artificers." icon_state = "inteqeng" - supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION + supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION /obj/item/clothing/under/syndicate/inteq/skirt/artificer name = "inteq artificer overall skirt" @@ -261,7 +261,7 @@ name = "inteq corpsman turtleneck" desc = "A sterile white turtleneck with tactical cargo pants, it is emblazoned with the lettering 'IRMG' on the shoulder. For the IRMG's support division Corpsmen." icon_state = "inteqmed" - supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION + supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION /obj/item/clothing/under/syndicate/inteq/skirt/corpsman name = "inteq corpsman skirtleneck" @@ -275,11 +275,9 @@ icon_state = "inteqmaid" item_state = "inteqmaid" can_adjust = FALSE - supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON + supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/syndicate/inteq/skirt/maid/Initialize() . = ..() var/obj/item/clothing/accessory/maidapron/inteq/A = new (src) attach_accessory(A) - - diff --git a/code/modules/disks/disk.dm b/code/modules/disks/disk.dm index 5e16d48c3dc0..9d2f4aac8232 100644 --- a/code/modules/disks/disk.dm +++ b/code/modules/disks/disk.dm @@ -56,14 +56,16 @@ writing.appearance_flags = RESET_COLOR . += writing -/obj/item/disk/attackby(obj/item/pen, mob/user, params) - if(!user.is_literate()) - to_chat(user, "You scribble illegibly on the cover of [src]!") - return - var/inputvalue = stripped_input(user, "What would you like to label the Disk?", "Disk Labelling", "", MAX_NAME_LEN) +/obj/item/disk/attackby(obj/item/object, mob/user, params) + if(istype(object, /obj/item/pen)) + if(!user.is_literate()) + to_chat(user, "You scribble illegibly on the cover of [src]!") + return + var/inputvalue = stripped_input(user, "What would you like to label the Disk?", "Disk Labelling", "", MAX_NAME_LEN) - if(!inputvalue) - return + if(!inputvalue) + return - if(user.canUseTopic(src, BE_CLOSE)) - name = "[initial(src.name)][(inputvalue ? " - '[inputvalue]'" : null)]" + if(user.canUseTopic(src, BE_CLOSE)) + name = "[initial(src.name)][(inputvalue ? " - '[inputvalue]'" : null)]" + return diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm deleted file mode 100644 index e4306e8ec4a6..000000000000 --- a/code/modules/events/anomaly.dm +++ /dev/null @@ -1,50 +0,0 @@ -/datum/round_event_control/anomaly - name = "Anomaly: Energetic Flux" - typepath = /datum/round_event/anomaly - - min_players = 1 - max_occurrences = 0 //This one probably shouldn't occur! It'd work, but it wouldn't be very fun. - weight = 15 - -/datum/round_event/anomaly - var/area/impact_area - var/obj/effect/anomaly/anomaly_path = /obj/effect/anomaly/flux - announceWhen = 1 - - -/datum/round_event/anomaly/proc/findEventArea() - var/static/list/allowed_areas - if(!allowed_areas) - //Places that shouldn't explode - var/list/safe_area_types = typecacheof(list( - /area/ship/science/ai_chamber, - /area/ship/engineering, - /area/ship/maintenance) - ) - - //Subtypes from the above that actually should explode. - var/list/unsafe_area_subtypes = typecacheof(list()) - - allowed_areas = make_associative(typesof(/area/ship)) - safe_area_types + unsafe_area_subtypes - var/list/possible_areas = typecache_filter_list(GLOB.sortedAreas,allowed_areas) - if (length(possible_areas)) - return pick(possible_areas) - -/datum/round_event/anomaly/setup() - impact_area = findEventArea() - if(!impact_area) - CRASH("No valid areas for anomaly found.") - var/list/turf_test = get_area_turfs(impact_area) - if(!turf_test.len) - CRASH("Anomaly : No valid turfs found for [impact_area] - [impact_area.type]") - -/datum/round_event/anomaly/announce(fake) - priority_announce("Localized energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert", zlevel = impact_area.virtual_z()) - -/datum/round_event/anomaly/start() - var/turf/T = pick(get_area_turfs(impact_area)) - var/newAnomaly - if(T) - newAnomaly = new anomaly_path(T) - if (newAnomaly) - announce_to_ghosts(newAnomaly) diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm deleted file mode 100644 index 78ed91c9c8fe..000000000000 --- a/code/modules/events/anomaly_bluespace.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/round_event_control/anomaly/anomaly_bluespace - name = "Anomaly: Bluespace" - typepath = /datum/round_event/anomaly/anomaly_bluespace - - max_occurrences = 1 - weight = 15 - -/datum/round_event/anomaly/anomaly_bluespace - startWhen = 3 - announceWhen = 10 - anomaly_path = /obj/effect/anomaly/bluespace - -/datum/round_event/anomaly/anomaly_bluespace/announce(fake) - priority_announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", zlevel = impact_area.virtual_z()) diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm deleted file mode 100644 index e8691e03e4fe..000000000000 --- a/code/modules/events/anomaly_flux.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/round_event_control/anomaly/anomaly_flux - name = "Anomaly: Hyper-Energetic Flux" - typepath = /datum/round_event/anomaly/anomaly_flux - - min_players = 10 - max_occurrences = 5 - weight = 20 - -/datum/round_event/anomaly/anomaly_flux - startWhen = 10 - announceWhen = 3 - anomaly_path = /obj/effect/anomaly/flux - -/datum/round_event/anomaly/anomaly_flux/announce(fake) - priority_announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", zlevel = impact_area.virtual_z()) diff --git a/code/modules/events/anomaly_grav.dm b/code/modules/events/anomaly_grav.dm deleted file mode 100644 index 27e50dd45c9b..000000000000 --- a/code/modules/events/anomaly_grav.dm +++ /dev/null @@ -1,26 +0,0 @@ -/datum/round_event_control/anomaly/anomaly_grav - name = "Anomaly: Gravitational" - typepath = /datum/round_event/anomaly/anomaly_grav - - max_occurrences = 5 - weight = 25 - -/datum/round_event/anomaly/anomaly_grav - startWhen = 3 - announceWhen = 20 - anomaly_path = /obj/effect/anomaly/grav - -/datum/round_event_control/anomaly/anomaly_grav/high - name = "Anomaly: Gravitational (High Intensity)" - typepath = /datum/round_event/anomaly/anomaly_grav/high - weight = 15 - max_occurrences = 1 - earliest_start = 20 MINUTES - -/datum/round_event/anomaly/anomaly_grav/high - startWhen = 3 - announceWhen = 20 - anomaly_path = /obj/effect/anomaly/grav/high - -/datum/round_event/anomaly/anomaly_grav/announce(fake) - priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", zlevel = impact_area.virtual_z()) diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm deleted file mode 100644 index 49d62899e8cc..000000000000 --- a/code/modules/events/anomaly_pyro.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/round_event_control/anomaly/anomaly_pyro - name = "Anomaly: Pyroclastic" - typepath = /datum/round_event/anomaly/anomaly_pyro - - max_occurrences = 5 - weight = 15 //WS Edit - Pyroclastic Rebalance - -/datum/round_event/anomaly/anomaly_pyro - startWhen = 3 - announceWhen = 10 - anomaly_path = /obj/effect/anomaly/pyro - -/datum/round_event/anomaly/anomaly_pyro/announce(fake) - priority_announce("Pyroclastic anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", zlevel = impact_area.virtual_z()) diff --git a/code/modules/events/anomaly_vortex.dm b/code/modules/events/anomaly_vortex.dm deleted file mode 100644 index f14c7d4dc134..000000000000 --- a/code/modules/events/anomaly_vortex.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/round_event_control/anomaly/anomaly_vortex - name = "Anomaly: Vortex" - typepath = /datum/round_event/anomaly/anomaly_vortex - - min_players = 20 - max_occurrences = 2 - weight = 10 - -/datum/round_event/anomaly/anomaly_vortex - startWhen = 10 - announceWhen = 3 - anomaly_path = /obj/effect/anomaly/bhole - -/datum/round_event/anomaly/anomaly_vortex/announce(fake) - priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert", zlevel = impact_area.virtual_z()) diff --git a/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm b/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm index c014e1f29f24..2dbbb4f5cc86 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm @@ -70,7 +70,7 @@ to_chat(user, "[target] is empty.") return COMPONENT_NO_AFTERATTACK - if(reagents.holder_full()) + if(attacking_item.reagents.holder_full()) to_chat(user, "[attacking_item] is full.") return COMPONENT_NO_AFTERATTACK diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index bd1322a96167..a2ea84f03777 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -9,7 +9,7 @@ maturation = 8 potency = 20 growthstages = 1 - growing_icon = 'goon/icons/obj/hydroponics.dmi' + growing_icon = 'icons/obj/hydroponics/growing.dmi' icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes icon_dead = "cannabis-dead" // Same for the dead icon genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -82,7 +82,7 @@ /obj/item/reagent_containers/food/snacks/grown/cannabis seed = /obj/item/seeds/cannabis - icon = 'goon/icons/obj/hydroponics.dmi' + icon = 'icons/obj/hydroponics/harvest.dmi' name = "cannabis leaf" desc = "Recently legalized in most galaxies." icon_state = "cannabis" diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index 9f997d12ee4e..2184cd3869f0 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -1,60 +1,50 @@ GLOBAL_LIST_EMPTY(exp_to_update) GLOBAL_PROTECT(exp_to_update) -// Procs -/datum/job/proc/required_playtime_remaining(client/C) - if(!C) - return 0 - if(!CONFIG_GET(flag/use_exp_tracking)) - return 0 - if(!SSdbcore.Connect()) - return 0 - if(!exp_requirements || !exp_type) - return 0 - if(!job_is_xp_locked(src.name)) - return 0 - if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_rights_for(C,R_ADMIN)) - return 0 - var/isexempt = C.prefs.db_flags & DB_FLAG_EXEMPT - if(isexempt) - return 0 - var/my_exp = C.calc_exp_type(get_exp_req_type()) - var/job_requirement = get_exp_req_amount() - if(my_exp >= job_requirement) - return 0 - else - return (job_requirement - my_exp) - -/datum/job/proc/get_exp_req_amount() - if(name in (GLOB.command_positions | list("AI"))) - var/uerhh = CONFIG_GET(number/use_exp_restrictions_heads_hours) - if(uerhh) - return uerhh * 60 - return exp_requirements - -/datum/job/proc/get_exp_req_type() - if(name in (GLOB.command_positions | list("AI"))) - if(CONFIG_GET(flag/use_exp_restrictions_heads_department) && exp_type_department) - return exp_type_department - return exp_type - -/proc/job_is_xp_locked(jobtitle) - if(!CONFIG_GET(flag/use_exp_restrictions_heads) && (jobtitle in (GLOB.command_positions | list("AI")))) +/datum/map_template/shuttle/proc/has_ship_spawn_playtime(client/Client) + if(!Client) // lol. client deletion return FALSE - if(!CONFIG_GET(flag/use_exp_restrictions_other) && !(jobtitle in (GLOB.command_positions | list("AI")))) + // checks config values, DB status, and client-specific exemptions. + if(Client.is_playtime_restriction_eligible()) + var/player_living_time = Client.get_exp_living(TRUE) // returns value in minutes + var/req_spawn_time = get_req_spawn_minutes() + if(player_living_time < req_spawn_time) + return FALSE + return TRUE + +/datum/map_template/shuttle/proc/has_job_playtime(client/Client, datum/job/Job) + if(!Client) // lol. client deletion return FALSE + // job must be an officer to enforce playtime requirements, AND we need to check + // config values, DB status, and client-specific exceptions. + if(Job.officer && Client.is_playtime_restriction_eligible()) + var/player_living_time = Client.get_exp_living(TRUE) // returns value in minutes + var/req_join_time = get_req_officer_minutes() + if(player_living_time < req_join_time) + return FALSE return TRUE -/client/proc/calc_exp_type(exptype) - var/list/explist = prefs.exp.Copy() - var/amount = 0 - var/list/typelist = GLOB.exp_jobsmap[exptype] - if(!typelist) - return -1 - for(var/job in typelist["titles"]) - if(job in explist) - amount += explist[job] - return amount +/datum/map_template/shuttle/proc/get_req_spawn_minutes() + if(!CONFIG_GET(flag/use_exp_tracking) || !SSdbcore.Connect()) + return 0 + return spawn_time_coeff * CONFIG_GET(number/ship_spawn_base_exp_min) + +/datum/map_template/shuttle/proc/get_req_officer_minutes() + if(!CONFIG_GET(flag/use_exp_tracking) || !SSdbcore.Connect()) + return 0 + return officer_time_coeff * CONFIG_GET(number/officer_join_base_exp_min) + +/client/proc/is_playtime_restriction_eligible() + if(!CONFIG_GET(flag/use_exp_tracking)) + return FALSE // playtime tracking must be enabled + if(!SSdbcore.Connect()) + return FALSE // must have an active DB + + // not actually entirely sure what this is. believe it's a flag for exemption from exp restrictions? sure, whatever + if(prefs.db_flags & DB_FLAG_EXEMPT) + return FALSE + if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_rights_for(src, R_ADMIN)) + return FALSE // if admin exemption is enabled, and client is an admin, let them through /client/proc/get_exp_living(pure_numeric = FALSE) if(!prefs.exp) diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 01133eb0f134..550b496344ff 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -27,11 +27,6 @@ //If you have the use_age_restriction_for_jobs config option enabled and the database set up, this option will add a requirement for players to be at least minimal_player_age days old. (meaning they first signed in at least that many days before.) var/minimal_player_age = 0 - var/exp_requirements = 0 - - var/exp_type = "" - var/exp_type_department = "" - /// A link to the relevant wiki related to the job. Ex: "Space_law" would link to wiki.blah/Space_law var/wiki_page = "" diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index 5717edf1d22b..e3df96314769 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -4,9 +4,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 30 - exp_requirements = 180 - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_SILICON display_order = JOB_DISPLAY_ORDER_AI var/do_special_check = TRUE wiki_page = "AI" //WS Edit - Wikilinks/Warning diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index c1e73a823d10..ec472f03cb44 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -235,7 +235,7 @@ Assistant /datum/outfit/job/assistant/pharma name = "Pharmacology Student" - uniform = /obj/item/clothing/under/rank/medical/chemist/junior_chemist + uniform = /obj/item/clothing/under/rank/medical/ shoes = /obj/item/clothing/shoes/sneakers/white accessory = /obj/item/clothing/neck/scarf/orange l_pocket = /obj/item/pda/medical diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index d5350deb179d..46a5ddef7a5f 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -2,8 +2,6 @@ name = "Atmospheric Technician" total_positions = 3 spawn_positions = 2 - exp_requirements = 60 - exp_type = EXP_TYPE_CREW wiki_page = "Guide_to_Atmospherics" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/atmos @@ -65,7 +63,7 @@ alt_suit = /obj/item/clothing/suit/hazardvest neck = /obj/item/clothing/neck/tie/light_blue - backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/storage/belt/utility/atmostech=1) + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) //Shiptest /datum/outfit/job/atmos/gec diff --git a/code/modules/jobs/job_types/brig_physician.dm b/code/modules/jobs/job_types/brig_physician.dm index 3f13ed15ad59..d200df298d61 100644 --- a/code/modules/jobs/job_types/brig_physician.dm +++ b/code/modules/jobs/job_types/brig_physician.dm @@ -3,8 +3,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 7 - exp_requirements = 300 - exp_type = EXP_TYPE_CREW wiki_page = "Guide_to_Medicine" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/brig_phys @@ -23,7 +21,6 @@ belt = /obj/item/pda/brig_phys ears = /obj/item/radio/headset/headset_medsec/alt uniform = /obj/item/clothing/under/rank/security/brig_phys - alt_uniform = /obj/item/clothing/under/rank/medical/doctor/red shoes = /obj/item/clothing/shoes/sneakers/white glasses = /obj/item/clothing/glasses/hud/health/sunglasses suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys @@ -55,7 +52,6 @@ name = "Medic (Twinkleshine)" gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - uniform = /obj/item/clothing/under/rank/medical/doctor/red alt_uniform = /obj/item/clothing/under/syndicate/cybersun glasses = /obj/item/clothing/glasses/hud/health belt = /obj/item/storage/belt/medical diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index f437e42b8b35..f0c1f8c99553 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -4,9 +4,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 30 - exp_requirements = 180 - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_COMMAND officer = TRUE wiki_page = "Captain" diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index bb7dbfda1b0b..efb9292353b7 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -142,19 +142,3 @@ name = "Chaplain (Rabbi)" head = /obj/item/clothing/head/kippah l_hand = /obj/item/storage/book/bible/torah - -/datum/outfit/job/chaplain/roumain - name = "Hunter Montagne (Saint-Roumain Militia)" - uniform = /obj/item/clothing/under/suit/roumain - alt_uniform = null - shoes = /obj/item/clothing/shoes/workboots/mining - suit = /obj/item/clothing/suit/armor/hos/roumain/montagne - head = /obj/item/clothing/head/HoS/cowboy/montagne - gloves = null - id = /obj/item/card/id/gold - duffelbag = /obj/item/storage/backpack/cultpack - courierbag = /obj/item/storage/backpack/cultpack - backpack_contents = list( - /obj/item/stamp/chap = 1, - /obj/item/melee/classic_baton/telescopic=1 - ) diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index adcaf30bf0c5..6f822cb0bca1 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -2,8 +2,6 @@ name = "Chemist" total_positions = 2 spawn_positions = 2 - exp_type = EXP_TYPE_CREW - exp_requirements = 60 wiki_page = "Guide_to_Chemistry" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/chemist @@ -41,8 +39,6 @@ jobtype = /datum/job/chemist glasses = null - - uniform = /obj/item/clothing/under/rank/medical/chemist/pharmacist alt_uniform = null backpack_contents = list(/obj/item/clothing/glasses/science=1) @@ -51,7 +47,6 @@ name = "Chemist (Pharmacologist)" glasses = null - uniform = /obj/item/clothing/under/rank/medical/chemist/pharmacologist alt_uniform = null suit = /obj/item/clothing/suit/toggle/labcoat/chemist/side @@ -61,7 +56,6 @@ name = "Chemist (Junior Chemist)" glasses = null - uniform = /obj/item/clothing/under/rank/medical/chemist/junior_chemist alt_uniform = null suit = null alt_suit = null @@ -72,7 +66,6 @@ name = "Chemist (Senior Chemist)" glasses = null - uniform = /obj/item/clothing/under/suit/senior_chemist alt_uniform = null shoes = /obj/item/clothing/shoes/laceup suit = /obj/item/clothing/suit/toggle/lawyer/orange @@ -102,8 +95,6 @@ belt = /obj/item/storage/bag/chemistry l_pocket =/obj/item/pda/chemist r_pocket = /obj/item/storage/pill_bottle - uniform = /obj/item/clothing/under/suit/senior_chemist - alt_uniform = /obj/item/clothing/under/rank/medical/chemist/pharmacologist suit = /obj/item/clothing/suit/longcoat/chemist alt_suit = /obj/item/clothing/suit/toggle/labcoat/chemist/side dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical @@ -114,8 +105,6 @@ /datum/outfit/job/chemist/minutemen name = "Chemical Scientist(minutemen)" - uniform = /obj/item/clothing/under/rank/medical/chemist/pharmacologist - alt_uniform = /obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt suit = /obj/item/clothing/suit/toggle/labcoat/chemist ears = /obj/item/radio/headset/minutemen diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index c4591bcbffb9..b13101bd088c 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -4,9 +4,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 7 - exp_requirements = 180 - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_ENGINEERING officer = TRUE wiki_page = "Chief_Engineer" //WS Edit - Wikilinks/Warning @@ -75,7 +72,7 @@ head = /obj/item/clothing/head/hardhat/white gloves = null neck = /obj/item/clothing/neck/tie/green - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/storage/belt/utility/chief/full=1, /obj/item/clothing/gloves/color/black=1) + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/clothing/gloves/color/black=1) /datum/outfit/job/ce/gec name = "Chief Engineer (GEC)" @@ -136,3 +133,21 @@ shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat belt = /obj/item/storage/belt/utility/full + +/datum/outfit/job/ce/minutemen + name = "Foreman (Colonial Minutemen)" + + ears = /obj/item/radio/headset/minutemen/alt + uniform = /obj/item/clothing/under/rank/command/minutemen + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/lawyer/minutemen + alt_suit = null + gloves = /obj/item/clothing/gloves/combat + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/combat + head = /obj/item/clothing/head/cowboy/sec/minutemen + backpack = /obj/item/storage/backpack + backpack_contents = list( + /obj/item/melee/classic_baton/telescopic=1, + /obj/item/modular_computer/tablet/preset/advanced = 1 + ) diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index ddc7f021965a..4ad8cea562a8 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -4,9 +4,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 7 - exp_requirements = 180 - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_MEDICAL officer = TRUE wiki_page = "Chief_Medical_Officer" @@ -59,7 +56,6 @@ /datum/outfit/job/cmo/medicaldirector name = "Chief Medical Officer (Medical Director)" - uniform = /obj/item/clothing/under/suit/cmo alt_uniform = null shoes = /obj/item/clothing/shoes/laceup suit = /obj/item/clothing/suit/toggle/lawyer/cmo @@ -72,7 +68,7 @@ /datum/outfit/job/cmo/surgeongeneral name = "Chief Medical Officer (Surgeon-General)" - uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/surgeon_general + uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer alt_uniform = null shoes = /obj/item/clothing/shoes/laceup suit = /obj/item/clothing/suit/toggle/labcoat/cmo diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 32b6ce5d8eef..3eddc92c017d 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -4,8 +4,6 @@ total_positions = 0 spawn_positions = 1 //Nodrak minimal_player_age = 21 - exp_requirements = 120 - exp_type = EXP_TYPE_CREW wiki_page = "Cyborg" //WS Edit - Wikilinks/Warning display_order = JOB_DISPLAY_ORDER_CYBORG diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index ae7400209056..9a263ae85207 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -4,8 +4,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 7 - exp_requirements = 300 - exp_type = EXP_TYPE_CREW wiki_page = "Space_Law" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/detective diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index d94c2ba969b4..181109e65c31 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -2,8 +2,6 @@ name = "Geneticist" //WS Edit - More Gen/Sci Split total_positions = 2 spawn_positions = 2 //WS Edit - Gen/Sci Split - exp_type = EXP_TYPE_CREW - exp_requirements = 60 wiki_page = "Guide_to_Genetics" //WS Edit - Wikilinks outfit = /datum/outfit/job/geneticist diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 6fd9e219d47e..205d5e57bb94 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -4,11 +4,8 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 10 - exp_requirements = 180 officer = TRUE wiki_page = "Head_of_Personnel" //WS Edit - Wikilinks/Warning - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_SERVICE outfit = /datum/outfit/job/head_of_personnel @@ -25,8 +22,8 @@ ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, + ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM) display_order = JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL @@ -57,8 +54,6 @@ /datum/outfit/job/head_of_personnel/pre_equip(mob/living/carbon/human/H) ..() - if(locate(/datum/holiday/ianbirthday) in SSevents.holidays) - undershirt = /datum/sprite_accessory/undershirt/ian /datum/outfit/job/head_of_personnel/nt name = "First Officer (Nanotrasen)" diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 71ee9987f779..c2c91c204fa4 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -4,13 +4,9 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 14 - exp_requirements = 300 officer = TRUE wiki_page = "Head_of_Security" //WS Edit - Wikilinks/Warning - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_SECURITY - outfit = /datum/outfit/job/hos mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) @@ -96,3 +92,38 @@ gloves = /obj/item/clothing/gloves/combat backpack_contents = list(/obj/item/melee/baton/loaded=1) suit_store = null + +/datum/outfit/job/hos/roumain + jobtype = /datum/job/hos/roumain + name = "Hunter Montagne (Saint-Roumain Militia)" + ears = /obj/item/radio/headset/headset_com + uniform = /obj/item/clothing/under/suit/roumain + alt_uniform = null + shoes = /obj/item/clothing/shoes/workboots/mining + suit = /obj/item/clothing/suit/armor/hos/roumain/montagne + alt_suit = null + dcoat = null + head = /obj/item/clothing/head/HoS/cowboy/montagne + gloves = null + id = /obj/item/card/id/silver + belt = null + glasses = null + suit_store = null + r_pocket = null + l_pocket = null + duffelbag = /obj/item/storage/backpack/cultpack + courierbag = /obj/item/storage/backpack/cultpack + backpack = /obj/item/storage/backpack/cultpack + satchel = /obj/item/storage/backpack/cultpack + box = null + implants = null + chameleon_extras = null + backpack_contents = list( + /obj/item/book/manual/srmlore, + /obj/item/stamp/chap = 1, + /obj/item/melee/classic_baton/telescopic=1 + ) + +/datum/job/hos/roumain + outfit = /datum/outfit/job/hos/roumain + mind_traits = null diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 221c29482d7c..f20580ef7b2a 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -35,7 +35,6 @@ chameleon_extras = /obj/item/gun/syringe -//WS Edit Start - Alt-Job Titles /datum/outfit/job/doctor/surgeon name = "Medical Doctor (Surgeon)" @@ -56,7 +55,6 @@ /datum/outfit/job/doctor/juniordoctor name = "Medical Doctor (Junior Doctor)" - uniform = /obj/item/clothing/under/rank/medical/doctor/junior_doctor alt_uniform = null shoes = /obj/item/clothing/shoes/sneakers/blue suit = null @@ -69,7 +67,7 @@ /datum/outfit/job/doctor/seniordoctor name = "Medical Doctor (Senior Doctor)" - uniform = /obj/item/clothing/under/suit/senior_doctor + uniform = /obj/item/clothing/under/rank/medical/doctor alt_uniform = null shoes = /obj/item/clothing/shoes/laceup suit = /obj/item/clothing/suit/toggle/lawyer/medical @@ -85,7 +83,6 @@ name = "Medical Doctor (Psychiatrist)" uniform = /obj/item/clothing/under/rank/medical/psychiatrist - alt_uniform = /obj/item/clothing/under/rank/medical/psychiatrist/blue shoes = /obj/item/clothing/shoes/laceup suit = null alt_suit = null @@ -93,7 +90,6 @@ suit_store = null backpack_contents = list(/obj/item/clipboard=1, /obj/item/folder/white=1, /obj/item/taperecorder=1) -//WS Edit End - Alt-Job Titles //Shiptest outfits diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 3ada9c5afa27..515c8d6e8f17 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -4,7 +4,6 @@ spawn_positions = 1 wiki_page = "Quartermaster" //WS Edit - Wikilinks/Warning officer = TRUE - exp_type_department = EXP_TYPE_SUPPLY // This is so the jobs menu can work properly outfit = /datum/outfit/job/quartermaster diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 8c070d50437b..2fd7fea06db7 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -4,9 +4,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 7 - exp_type_department = EXP_TYPE_SCIENCE - exp_requirements = 180 - exp_type = EXP_TYPE_CREW officer = TRUE wiki_page = "Research_Director" //WS Edit - Wikilinks/Warning diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index f95859a34ab3..dd2cf4f489b5 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -2,8 +2,6 @@ name = "Roboticist" total_positions = 2 spawn_positions = 2 - exp_requirements = 60 - exp_type = EXP_TYPE_CREW wiki_page = "Guide_to_Robotics" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/roboticist @@ -79,8 +77,6 @@ dcoat = null neck = /obj/item/clothing/neck/tie/black - backpack_contents = list(/obj/item/storage/belt/utility/full=1) - //Shiptest Outfits /datum/outfit/job/roboticist/technician diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index ca706ed348f1..391db06c289a 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -2,8 +2,6 @@ name = "Scientist" total_positions = 5 spawn_positions = 3 - exp_requirements = 60 - exp_type = EXP_TYPE_CREW wiki_page = "Scientist" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/scientist @@ -82,3 +80,9 @@ alt_suit = /obj/item/clothing/suit/toggle/labcoat/science dcoat = null neck = /obj/item/clothing/neck/tie/purple + +/datum/outfit/job/scientist/minutemen + name = "Scientist (Minutemen)" + + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + backpack = /obj/item/storage/backpack/security/cmm diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index c2f8edd048c7..96a132bf75f6 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -4,8 +4,6 @@ total_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() spawn_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() minimal_player_age = 7 - exp_requirements = 300 - exp_type = EXP_TYPE_CREW wiki_page = "Space_Law" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/security diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index c1abe240346e..9c4816533157 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -56,8 +56,8 @@ /obj/item/kitchen/knife/combat/survival=1, /obj/item/mining_voucher=1, /obj/item/mining_scanner=1, - /obj/item/gun/energy/kinetic_accelerator=1,\ /obj/item/stack/marker_beacon/ten=1) + belt = /obj/item/gun/energy/kinetic_accelerator /datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -94,6 +94,13 @@ satchel = /obj/item/storage/backpack/satchel/tox courierbag = /obj/item/storage/backpack/messenger/tox +/datum/outfit/job/miner/syndicate/gorlex + name = "Wrecker (Gorlex Marauders)" + + uniform = /obj/item/clothing/under/syndicate/gorlex + shoes = /obj/item/clothing/shoes/workboots + ears = /obj/item/radio/headset/alt + /datum/outfit/job/miner/syndicate/sbc name = "Miner (Twinkleshine)" @@ -139,8 +146,8 @@ /obj/item/mining_scanner=1, /obj/item/reagent_containers/hypospray/medipen/survival, /obj/item/reagent_containers/hypospray/medipen/survival,\ - /obj/item/gun/energy/kinetic_accelerator/old=1,\ /obj/item/stack/marker_beacon/ten=1) + belt = /obj/item/gun/energy/kinetic_accelerator/old /datum/outfit/job/miner/righand name = "Righand" @@ -184,3 +191,14 @@ head = /obj/item/clothing/head/hardhat/orange suit = /obj/item/clothing/suit/toggle/industrial suit_store = /obj/item/tank/internals/emergency_oxygen/double + +/datum/outfit/job/miner/hazard/minutemen + name = "Industrial Miner (Minutemen)" + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/combat + backpack_contents = list( + /obj/item/flashlight/seclite=1, + /obj/item/stack/marker_beacon/ten=1, + /obj/item/weldingtool=1 + ) + diff --git a/code/modules/jobs/job_types/solgov_rep.dm b/code/modules/jobs/job_types/solgov_rep.dm index afeb2eae4ce2..a7c185624763 100644 --- a/code/modules/jobs/job_types/solgov_rep.dm +++ b/code/modules/jobs/job_types/solgov_rep.dm @@ -8,10 +8,7 @@ SolGov Representative spawn_positions = 2 wiki_page = "Government_Attaché" minimal_player_age = 7 - exp_requirements = 180 officer = TRUE - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_SECURITY access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SOLGOV) diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 303187683e21..827ff2abe9f9 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -2,8 +2,6 @@ name = "Station Engineer" total_positions = 5 spawn_positions = 5 - exp_requirements = 60 - exp_type = EXP_TYPE_CREW wiki_page = "Station_Engineer" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/engineer @@ -100,7 +98,7 @@ shoes = /obj/item/clothing/shoes/laceup head = /obj/item/clothing/head/hardhat neck = /obj/item/clothing/neck/tie/orange - backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/storage/belt/utility/full/engi=1) + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) /datum/outfit/job/engineer/telecomsspecialist name = "Station Engineer (Telecommunications Specialist)" diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 23f6a77eed19..85f038e1b476 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -2,8 +2,6 @@ name = "Virologist" total_positions = 1 spawn_positions = 1 - exp_type = EXP_TYPE_CREW - exp_requirements = 60 wiki_page = "Infections" //WS Edit - Wikilinks/Warning outfit = /datum/outfit/job/virologist @@ -38,7 +36,6 @@ /datum/outfit/job/virologist/pathologist name = "Virologist (Pathologist)" - uniform = /obj/item/clothing/under/suit/pathologist alt_uniform = null shoes = /obj/item/clothing/shoes/laceup neck = /obj/item/clothing/neck/tie/green diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 2dd395e80ae3..1167989d1afd 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -4,8 +4,6 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 7 - exp_requirements = 300 - exp_type = EXP_TYPE_CREW officer = TRUE wiki_page = "Space_Law" //WS Edit - Wikilinks/Warning diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 810e18b49210..d1b930174490 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -65,7 +65,8 @@ GLOBAL_LIST_INIT(nonhuman_positions, list( "Cyborg", ROLE_PAI)) -// job categories for rendering the late join menu +// Job categories for rendering the late join menu. +// Currently unused. GLOBAL_LIST_INIT(position_categories, list( EXP_TYPE_COMMAND = list("jobs" = command_positions, "color" = "#ccccff"), EXP_TYPE_ENGINEERING = list("jobs" = engineering_positions, "color" = "#ffeeaa"), @@ -77,6 +78,8 @@ GLOBAL_LIST_INIT(position_categories, list( EXP_TYPE_SECURITY = list("jobs" = security_positions, "color" = "#ffdddd") )) +// Previously used to lookup the cumulative amount of time spent in a department. +// Currently unused. GLOBAL_LIST_INIT(exp_jobsmap, list( EXP_TYPE_CREW = list("titles" = command_positions | engineering_positions | medical_positions | science_positions | supply_positions | security_positions | service_positions | list("AI","Cyborg")), // crew positions EXP_TYPE_COMMAND = list("titles" = command_positions), @@ -89,12 +92,15 @@ GLOBAL_LIST_INIT(exp_jobsmap, list( EXP_TYPE_SERVICE = list("titles" = service_positions) )) +// Special, unusual cases for experience tracking. +// Occasionally used by some gamemode code. GLOBAL_LIST_INIT(exp_specialmap, list( EXP_TYPE_LIVING = list(), // all living mobs EXP_TYPE_ANTAG = list(), EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Servant Golem","Free Golem","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role"), // Ghost roles EXP_TYPE_GHOST = list() // dead people, observers )) + GLOBAL_PROTECT(exp_jobsmap) GLOBAL_PROTECT(exp_specialmap) diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index b90c57b6b601..323387f721fe 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -46,8 +46,8 @@ window.set_mouse_macro() if(prefs?.hotkeys)//tg put hotkeys at the client level, idk why, we still have it on prefs so I'm just gonna nullcheck this. - winset(src, null, "map.focus=true input.background-color=[COLOR_INPUT_DISABLED] mainwindow.macro=default") + winset(src, null, "map.focus=true mainwindow.macro=default") else - winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=old_default") + winset(src, null, "input.focus=true mainwindow.macro=old_default") update_special_keybinds() diff --git a/code/modules/language/dwarven.dm b/code/modules/language/dwarven.dm deleted file mode 100644 index 3dcd2193e3ea..000000000000 --- a/code/modules/language/dwarven.dm +++ /dev/null @@ -1,16 +0,0 @@ -// The language of the Dwarves, based on Dwarf Fortress - -/datum/language/dwarf - name = "Dwenmar" - desc = "A conlang forged by dwarves for internal communication. Slowly transforming into a dead language. " - speech_verb = "bellows" - whisper_verb = "mutters" - sing_verb = "sings" - space_chance = 100 // Each 'syllable' is its own word - key = "D" - flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD - - syllables = list("kulet", "alak", "bidok", "nicol", "anam", "gatal", "mabdug", "zustash", "sedil", "ustos", "emr", "izeg", "beming", "gost", "ntak", "tosid", "feb", "berim", "ibruk", "ermis", "thoth", "thatthil", "gistang", "libash", "lakish", "asdos", "roder", "nel", "biban", "ugog", "ish", "robek", "olmul", "nokzam", "emuth", "fer", "uvel", "dolush", "ag^k", "ucat", "ng rak", "enir", "ugath", "lisig", "etg", "erong", "osed", "lanlar", "udir", "tarmid", "s krith", "nural", "bugsud", "okag", "nazush", "nashon", "ftrid", "en''r", "dstik", "kogan", "ingish", "dudgoth", "stalk*b", "themor", "murak", "altth", "osod", "thcekut", "cog", "selsten", "egdoth", "othsin", "idek", "st", "suthmam", "im", "okab", "onlnl", "gasol", "tegir", "nam...sh", "noval", "shalig", "shin", "lek", ",,kim", "kfkdal", "stum", "alud", "olom", "%lot", "rozsed", "thos", "okon", "n
[station_time_timestamp_fancy("hh:mm")]") + for(var/mob/Mob as anything in GLOB.player_list) + if(dock_requester.shuttle_port.is_in_shuttle_bounds(Mob)) + Mob.play_screen_text("[planet_name]
[station_time_timestamp_fancy("hh:mm")]") + playsound(Mob, landing_sound, 50) + /datum/overmap/dynamic/post_undocked(datum/overmap/dock_requester) if(preserve_level) @@ -113,10 +118,17 @@ probabilities = list() for(var/datum/planet_type/planet_type as anything in subtypesof(/datum/planet_type)) probabilities[initial(planet_type.planet)] = initial(planet_type.weight) - planet = SSmapping.planet_types[force_encounter ? force_encounter : pickweightAllowZero(probabilities)] - Rename(planet.name) + + if(planet.planet !=DYNAMIC_WORLD_ASTEROID && planet.planet != DYNAMIC_WORLD_SPACERUIN) //these aren't real planets + planet_name = "[gen_planet_name()]" + Rename(planet_name) + token.name = "[planet_name]" + " ([planet.name])" + if(planet.planet == DYNAMIC_WORLD_ASTEROID || planet.planet == DYNAMIC_WORLD_SPACERUIN) + Rename(planet.name) + token.name = "[planet.name]" + token.icon_state = planet.icon_state token.desc = planet.desc token.color = planet.color @@ -124,6 +136,8 @@ default_baseturf = planet.default_baseturf mapgen = planet.mapgen weather_controller_type = planet.weather_controller_type + landing_sound = planet.landing_sound + preserve_level = planet.preserve_level //it came to me while I was looking at chickens if(vlevel_height >= 255 && vlevel_width >= 255) //little easter egg planet_name = "LV-[pick(rand(11111,99999))]" @@ -138,6 +152,7 @@ if(!preserve_level) token.desc += " It may not still be here if you leave it." + token.update_icon() /datum/overmap/dynamic/proc/gen_planet_name() . = "" @@ -192,7 +207,7 @@ icon_state = "away" // DO NOT PUT UNIQUE_AREA IN THESE FLAGS FOR ANY SUBTYPE. IT CAUSES WEATHER PROBLEMS // THE ONLY REASON IT DIDN'T BEFORE IS BECAUSE THE CODE DIDN'T RESPECT THE FLAG - area_flags = HIDDEN_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | NOTELEPORT + area_flags = HIDDEN_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED flags_1 = CAN_BE_DIRTY_1 dynamic_lighting = DYNAMIC_LIGHTING_FORCED sound_environment = SOUND_ENVIRONMENT_STONEROOM @@ -261,6 +276,13 @@ area_flags = HIDDEN_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED //allows jaunters to work ambientsounds = REEBE +/area/overmap_encounter/planetoid/asteroid + name = "\improper Asteroid Field" + sound_environment = SOUND_ENVIRONMENT_QUARRY + ambientsounds = SPACE - - +/area/overmap_encounter/planetoid/gas_giant + name = "\improper Gas Giant" + sound_environment = SOUND_ENVIRONMENT_MOUNTAINS + ambientsounds = REEBE + has_gravity = GAS_GIANT_GRAVITY diff --git a/code/modules/overmap/objects/event_datum.dm b/code/modules/overmap/objects/event_datum.dm index 156bb8487ab1..8ee2136e0d02 100644 --- a/code/modules/overmap/objects/event_datum.dm +++ b/code/modules/overmap/objects/event_datum.dm @@ -11,10 +11,12 @@ var/spread_chance = 0 ///How many additional tiles to spawn at once in the selected orbit. Used with OVERMAP_GENERATOR_SOLAR. var/chain_rate = 0 + var/desc /datum/overmap/event/Initialize(position, ...) . = ..() SSovermap.events += src + token.desc = desc /datum/overmap/event/Destroy() . = ..() @@ -24,72 +26,87 @@ * The main proc for calling other procs. Called by SSovermap. */ /datum/overmap/event/proc/apply_effect() - for(var/datum/overmap/ship/controlled/S in get_nearby_overmap_objects()) + for(var/datum/overmap/ship/controlled/Ship in get_nearby_overmap_objects()) if(prob(chance_to_affect)) - affect_ship(S) + affect_ship(Ship) /** * The proc called on all ships that are currently being affected. */ -/datum/overmap/event/proc/affect_ship(datum/overmap/ship/controlled/S) +/datum/overmap/event/proc/affect_ship(datum/overmap/ship/controlled/Ship) return -///METEOR STORMS - Bounces harmlessly off the shield... unless your shield is breached +///METEOR STORMS - explodes your ship if you go too fast /datum/overmap/event/meteor - name = "asteroid storm (moderate)" + name = "asteroid field (moderate)" + desc = "An area of space rich with asteroids, going fast through here could prove dangerous" token_icon_state = "meteor1" chance_to_affect = 15 spread_chance = 50 chain_rate = 4 + var/safe_speed = 3 var/list/meteor_types = list( /obj/effect/meteor/dust=3, /obj/effect/meteor/medium=8, - /obj/effect/meteor/big=3, - /obj/effect/meteor/flaming=1, + /obj/effect/meteor/big=1, /obj/effect/meteor/irradiated=3 ) /datum/overmap/event/meteor/Initialize(position, ...) . = ..() token.icon_state = "meteor[rand(1, 4)]" + token.color = "#a08444" + token.light_color = "#a08444" + token.update_icon() -/datum/overmap/event/meteor/affect_ship(datum/overmap/ship/controlled/S) - spawn_meteor(meteor_types, S.shuttle_port.get_virtual_level(), 0) +/datum/overmap/event/meteor/apply_effect() + for(var/datum/overmap/ship/controlled/Ship in get_nearby_overmap_objects()) + if(Ship.get_speed() > safe_speed) + var/how_fast = (Ship.get_speed() - safe_speed) + if(prob(chance_to_affect + how_fast)) + affect_ship(Ship) + +/datum/overmap/event/meteor/affect_ship(datum/overmap/ship/controlled/Ship) + spawn_meteor(meteor_types, Ship.shuttle_port.get_virtual_level(), 0) /datum/overmap/event/meteor/minor - name = "asteroid storm (minor)" + name = "asteroid field (minor)" chain_rate = 3 meteor_types = list( + /obj/effect/meteor/dust=12, /obj/effect/meteor/medium=4, - /obj/effect/meteor/big=8, - /obj/effect/meteor/flaming=3, - /obj/effect/meteor/irradiated=3 + /obj/effect/meteor/irradiated=2 ) /datum/overmap/event/meteor/major - name = "asteroid storm (major)" + name = "asteroid field (major)" spread_chance = 25 chain_rate = 6 meteor_types = list( - /obj/effect/meteor/medium=5, - /obj/effect/meteor/big=75, + /obj/effect/meteor/medium=50, + /obj/effect/meteor/big=25, /obj/effect/meteor/flaming=10, /obj/effect/meteor/irradiated=10, /obj/effect/meteor/tunguska = 1 ) -///ION STORM - Causes EMP pulses on the shuttle, wreaking havoc on the shields +///ION STORM - explodes your IPCs /datum/overmap/event/emp name = "ion storm (moderate)" + desc = "A heavily ionized area of space, prone to causing electromagnetic pulses in ships" token_icon_state = "ion1" spread_chance = 20 chain_rate = 2 - var/strength = 3 + chance_to_affect = 20 + var/strength = 4 /datum/overmap/event/emp/Initialize(position, ...) . = ..() token.icon_state = "ion[rand(1, 4)]" + token.color = "#7cb4d4" + token.light_color = "#7cb4d4" + token.update_icon() /datum/overmap/event/emp/affect_ship(datum/overmap/ship/controlled/S) var/area/source_area = pick(S.shuttle_port.shuttle_areas) @@ -99,40 +116,45 @@ for(var/mob/M as anything in GLOB.player_list) if(S.shuttle_port.is_in_shuttle_bounds(M)) M.playsound_local(S.shuttle_port, 'sound/weapons/ionrifle.ogg', strength) - shake_camera(M, 10, strength) /datum/overmap/event/emp/minor name = "ion storm (minor)" chain_rate = 1 strength = 1 + chance_to_affect = 15 /datum/overmap/event/emp/major name = "ion storm (major)" + chance_to_affect = 25 chain_rate = 4 - strength = 5 + strength = 6 -///ELECTRICAL STORM - Zaps places in the shuttle +///ELECTRICAL STORM - explodes your computer and IPCs /datum/overmap/event/electric name = "electrical storm (moderate)" + desc = "A spatial anomaly, an unfortunately common sight on the frontier. Disturbing it tends to lead to intense electrical discharges" token_icon_state = "electrical1" chance_to_affect = 15 spread_chance = 30 chain_rate = 3 + var/zap_flag = ZAP_STORM_FLAGS var/max_damage = 15 var/min_damage = 5 /datum/overmap/event/electric/Initialize(position, ...) . = ..() token.icon_state = "electrical[rand(1, 4)]" + token.color = "#e8e85c" + token.light_color = "#e8e85c" + token.update_icon() /datum/overmap/event/electric/affect_ship(datum/overmap/ship/controlled/S) var/datum/virtual_level/ship_vlevel = S.shuttle_port.get_virtual_level() var/turf/source = ship_vlevel.get_side_turf(pick(GLOB.cardinals)) - tesla_zap(source, 10, TESLA_DEFAULT_POWER, ZAP_TESLA_FLAGS) + tesla_zap(source, 10, TESLA_DEFAULT_POWER, zap_flag) for(var/mob/M as anything in GLOB.player_list) if(S.shuttle_port.is_in_shuttle_bounds(M)) M.playsound_local(source, 'sound/magic/lightningshock.ogg', rand(min_damage / 10, max_damage / 10)) - shake_camera(M, 10, rand(min_damage / 10, max_damage / 10)) /datum/overmap/event/electric/minor name = "electrical storm (minor)" @@ -147,9 +169,11 @@ chain_rate = 6 max_damage = 20 min_damage = 10 + zap_flag = ZAP_TESLA_FLAGS /datum/overmap/event/nebula name = "nebula" + desc = "There's coffee in here" token_icon_state = "nebula" chain_rate = 8 spread_chance = 75 @@ -157,9 +181,13 @@ /datum/overmap/event/nebula/Initialize(position, ...) . = ..() token.opacity = TRUE + token.color = "#c053f3" + token.light_color = "#c053f3" + token.update_icon() /datum/overmap/event/wormhole name = "wormhole" + desc = "A hole through space. If you go through here, you might end up anywhere." token_icon_state = "wormhole" spread_chance = 0 chain_rate = 0 @@ -176,6 +204,9 @@ other_wormhole = _other_wormhole if(!other_wormhole) other_wormhole = new(null, src) //Create a new wormhole at a random location + token.color = adjust_colors() + token.light_color = adjust_colors() + token.update_icon() /datum/overmap/event/wormhole/affect_ship(datum/overmap/ship/controlled/S) if(!other_wormhole) @@ -196,6 +227,111 @@ S.overmap_move(other_wormhole.x, other_wormhole.y) S.overmap_step(S.get_heading()) + token.color = adjust_colors() + token.light_color = adjust_colors() + +/datum/overmap/event/wormhole/proc/adjust_colors() + switch(stability) + if(1) + return "#753214" + if(2) + return "#642f19" + if(3) + return"#654650" + if(4) + return"#5c5d8b" + if(5) + return"#6d80c7" + +//Carp "meteors" - throws carp at the ship + +/datum/overmap/event/meteor/carp + name = "carp migration (moderate)" + desc = "A migratory school of space carp. They travel at high speeds, and flying through them may cause them to impact your ship" + token_icon_state = "carp1" + chance_to_affect = 15 + spread_chance = 50 + chain_rate = 4 + safe_speed = 2 + meteor_types = list( + /obj/effect/meteor/carp=16, + /obj/effect/meteor/carp/big=1, //numbers I pulled out of my ass + ) + +/datum/overmap/event/meteor/carp/Initialize(position, ...) + . = ..() + token.icon_state = "carp[rand(1, 4)]" + token.color = "#7b1ca8" + token.light_color = "#7b1ca8" + token.update_icon() + + +/datum/overmap/event/meteor/carp/minor + name = "carp migration (minor)" + token_icon_state = "carp1" + chance_to_affect = 5 + spread_chance = 25 + chain_rate = 4 + meteor_types = list( + /obj/effect/meteor/carp=8 + ) + + +/datum/overmap/event/meteor/carp/major + name = "carp migration (major)" + token_icon_state = "carp1" + chance_to_affect = 25 + spread_chance = 25 + chain_rate = 4 + meteor_types = list( + /obj/effect/meteor/carp=7, + /obj/effect/meteor/carp/big=1, + ) + +// dust clouds throw dust if you go Way Fast + +/datum/overmap/event/meteor/dust + name = "dust cloud" + desc = "A cloud of spaceborne dust. Relatively harmless, unless you're travelling at relative speeds" + token_icon_state = "carp1" + chance_to_affect = 30 + spread_chance = 50 + chain_rate = 4 + safe_speed = 7 + meteor_types = list( + /obj/effect/meteor/dust=3, + ) + +/datum/overmap/event/meteor/dust/Initialize(position, ...) + . = ..() + token.icon_state = "dust[rand(1, 4)]" + token.color = "#506469" //we should make these defines + token.light_color = "#506469" + token.update_icon() + +/datum/overmap/event/anomaly + name = "anomaly field" + desc = "A highly anomalous area of space, disturbing it leads to the manifestation of odd spatial phenomena" + token_icon_state = "anomaly1" + chance_to_affect = 10 + spread_chance = 35 + chain_rate = 6 + +/datum/overmap/event/anomaly/Initialize(position, ...) + . = ..() + token.icon_state = "anomaly[rand(1, 4)]" + token.color = "#c46a24" + token.light_color = "#c46a24" + token.update_icon() + +/datum/overmap/event/anomaly/affect_ship(datum/overmap/ship/controlled/S) + var/area/source_area = pick(S.shuttle_port.shuttle_areas) + var/source_object = pick(source_area.contents) + new /obj/effect/spawner/lootdrop/anomaly/storm(get_turf(source_object)) + for(var/mob/M as anything in GLOB.player_list) + if(S.shuttle_port.is_in_shuttle_bounds(M)) + M.playsound_local(S.shuttle_port, 'sound/effects/bamf.ogg', 100) + GLOBAL_LIST_INIT(overmap_event_pick_list, list( /datum/overmap/event/wormhole = 10, /datum/overmap/event/nebula = 60, @@ -207,6 +343,11 @@ GLOBAL_LIST_INIT(overmap_event_pick_list, list( /datum/overmap/event/emp/major = 45, /datum/overmap/event/meteor/minor = 45, /datum/overmap/event/meteor = 40, - /datum/overmap/event/meteor/major = 35 + /datum/overmap/event/meteor/major = 35, + /datum/overmap/event/meteor/carp/minor = 45, + /datum/overmap/event/meteor/carp = 35, + /datum/overmap/event/meteor/carp/major = 20, + /datum/overmap/event/meteor/dust = 50, + /datum/overmap/event/anomaly = 10 )) diff --git a/code/modules/overmap/objects/outpost.dm b/code/modules/overmap/objects/outpost.dm index c449181ce4ac..4ea930098c6b 100644 --- a/code/modules/overmap/objects/outpost.dm +++ b/code/modules/overmap/objects/outpost.dm @@ -14,6 +14,9 @@ Rename(gen_outpost_name()) fill_missions() addtimer(CALLBACK(src, .proc/fill_missions), 10 MINUTES, TIMER_STOPPABLE|TIMER_LOOP|TIMER_DELETE_ME) + var/station_icon_num + station_icon_num = rand(1,4) + token.icon_state = "station_[station_icon_num]" /datum/overmap/dynamic/outpost/get_jump_to_turf() if(reserve_docks) diff --git a/code/modules/overmap/objects/star.dm b/code/modules/overmap/objects/star.dm index 6dfca56def15..b031c467754c 100644 --- a/code/modules/overmap/objects/star.dm +++ b/code/modules/overmap/objects/star.dm @@ -5,10 +5,13 @@ var/color_vary = 0 /datum/overmap/star/Initialize(position, ...) - Rename(gen_star_name()) + var/name = gen_star_name() + Rename(name) + set_station_name(name) token.desc = token_desc alter_token_appearance() + /datum/overmap/star/proc/gen_star_name() return "[pick(GLOB.star_names)] [pick(GLOB.greek_letters)]" diff --git a/code/modules/overmap/overmap_token.dm b/code/modules/overmap/overmap_token.dm index 0281a4353099..45f50f9e41c1 100644 --- a/code/modules/overmap/overmap_token.dm +++ b/code/modules/overmap/overmap_token.dm @@ -34,9 +34,11 @@ cam_background.assigned_map = map_name cam_background.del_on_map_removal = FALSE update_screen() + update_icon() /obj/overmap/Destroy(force) if(parent) + stack_trace("attempted to qdel a token that still has a parent") return QDEL_HINT_LETMELIVE if(render_map) QDEL_NULL(cam_screen) diff --git a/code/modules/overmap/planets/planet_types.dm b/code/modules/overmap/planets/planet_types.dm index cda34db3eec4..2152d4efe5ef 100644 --- a/code/modules/overmap/planets/planet_types.dm +++ b/code/modules/overmap/planets/planet_types.dm @@ -9,65 +9,73 @@ var/icon_state = "globe" var/color = "#ffffff" var/weight = 20 + var/preserve_level = FALSE + var/landing_sound /datum/planet_type/lava name = "lava planet" - desc = "A very weak energy signal originating from a planet with lots of seismic and volcanic activity." + desc = "A planet rife with seismic and volcanic activity. High temperatures and dangerous xenofauna render it dangerous for the unprepared." planet = DYNAMIC_WORLD_LAVA - icon_state = "globe" + icon_state = "globe_2" color = COLOR_ORANGE mapgen = /datum/map_generator/planet_generator/lava default_baseturf = /turf/open/floor/plating/asteroid/basalt/lava weather_controller_type = /datum/weather_controller/lavaland ruin_type = RUINTYPE_LAVA + landing_sound = 'sound/effects/planet_landing_2.ogg' + /datum/planet_type/ice name = "frozen planet" - desc = "A very weak energy signal originating from a planet with traces of water and extremely low temperatures." + desc = "A frozen planet covered in thick snow, thicker ice, and dangerous predators." planet = DYNAMIC_WORLD_ICE - icon_state = "globe" + icon_state = "globe_2" color = COLOR_BLUE_LIGHT mapgen = /datum/map_generator/planet_generator/snow default_baseturf = /turf/open/floor/plating/asteroid/snow/icemoon weather_controller_type = /datum/weather_controller/snow_planet ruin_type = RUINTYPE_ICE + landing_sound = 'sound/effects/planet_landing_2.ogg' /datum/planet_type/jungle name = "jungle planet" - desc = "A very weak energy signal originating from a planet teeming with life." + desc = "A densely forested world, filled with vines, animals, and underbrush. Surprisingly habitable with a machete." planet = DYNAMIC_WORLD_JUNGLE - icon_state = "globe" + icon_state = "globe_2" color = COLOR_LIME mapgen = /datum/map_generator/planet_generator/jungle default_baseturf = /turf/open/floor/plating/dirt/jungle weather_controller_type = /datum/weather_controller/lush ruin_type = RUINTYPE_JUNGLE + landing_sound = 'sound/effects/planet_landing_1.ogg' /datum/planet_type/rock name = "rock planet" - desc = "A very weak energy signal originating from a iron rich and rocky planet." + desc = "A rocky red world in the midst of terraforming. While some plants have taken hold, it is widely hostile to life." planet = DYNAMIC_WORLD_ROCKPLANET - icon_state = "globe" + icon_state = "globe_2" color = "#bd1313" mapgen = /datum/map_generator/planet_generator/rock default_baseturf = /turf/open/floor/plating/asteroid weather_controller_type = /datum/weather_controller/rockplanet ruin_type = RUINTYPE_ROCK + landing_sound = 'sound/effects/planet_landing_2.ogg' /datum/planet_type/sand name = "sand planet" - desc = "A very weak energy signal originating from a planet with many traces of silica." + desc = "A formerly vibrant world, turned to sand by the ravages of the ICW. The survivors of it are long mad by now." planet = DYNAMIC_WORLD_SAND - icon_state = "globe" + icon_state = "globe_2" color = COLOR_GRAY mapgen = /datum/map_generator/planet_generator/sand default_baseturf = /turf/open/floor/plating/asteroid/whitesands weather_controller_type = /datum/weather_controller/desert ruin_type = RUINTYPE_SAND + landing_sound = 'sound/effects/planet_landing_2.ogg' /datum/planet_type/beach name = "beach planet" - desc = "A very weak energy signal originating from a warm, oxygen rich planet." + desc = "The platonic ideal of vacation spots. Warm, comfortable temperatures, and a breathable atmosphere." planet = DYNAMIC_WORLD_BEACHPLANET icon_state = "globe" color = "#c6b597" @@ -75,6 +83,7 @@ default_baseturf = /turf/open/floor/plating/asteroid/sand/lit weather_controller_type = /datum/weather_controller/lush ruin_type = RUINTYPE_BEACH + landing_sound = 'sound/effects/planet_landing_1.ogg' /datum/planet_type/reebe name = "???" @@ -89,17 +98,18 @@ ruin_type = RUINTYPE_YELLOW /datum/planet_type/asteroid - name = "large asteroid" - desc = "A large asteroid with significant traces of minerals." + name = "asteroid field" + desc = "A field of asteroids with significant traces of minerals." planet = DYNAMIC_WORLD_ASTEROID icon_state = "asteroid" color = COLOR_GRAY - mapgen = /datum/map_generator/single_biome/asteroid + mapgen = /datum/map_generator/planet_generator/asteroid // Space, because asteroid maps also include space turfs and the prospect of space turfs // existing without space as their baseturf scares me. default_baseturf = /turf/open/space weather_controller_type = null ruin_type = null // asteroid ruins when + landing_sound = 'sound/effects/planet_landing_1.ogg' /datum/planet_type/spaceruin name = "weak energy signal" @@ -111,14 +121,42 @@ default_baseturf = /turf/open/space weather_controller_type = null ruin_type = RUINTYPE_SPACE + landing_sound = 'sound/effects/planet_landing_2.ogg' /datum/planet_type/waste name = "waste disposal planet" - desc = "A very weak energy signal originating from a planet marked as waste disposal." + desc = "A highly oxygenated world, coated in garbage, radiation, and rust." planet = DYNAMIC_WORLD_WASTEPLANET - icon_state = "globe" + icon_state = "globe_2" color = "#a9883e" mapgen = /datum/map_generator/planet_generator/waste default_baseturf = /turf/open/floor/plating/asteroid/wasteplanet weather_controller_type = /datum/weather_controller/chlorine ruin_type = RUINTYPE_WASTE + landing_sound = 'sound/effects/planet_landing_2.ogg' + +/datum/planet_type/gas_giant + name = "gas giant" + desc = "A floating ball of gas, with high gravity and even higher pressure." + planet = DYNAMIC_WORLD_GAS_GIANT + icon_state = "globe" + color = COLOR_DARK_MODERATE_ORANGE + mapgen = /datum/map_generator/single_biome/gas_giant + default_baseturf = /turf/open/chasm/gas_giant + weather_controller_type = null + ruin_type = null //it's a Gas Giant. Not Cloud fuckin City + weight = 0 + preserve_level = TRUE + landing_sound = 'sound/effects/planet_landing_1.ogg' + +/datum/planet_type/plasma_giant + name = "plasma giant" + desc = "The backbone of interstellar travel, the mighty plasma giant allows fuel collection to take place." + planet = DYNAMIC_WORLD_PLASMA_GIANT + color = COLOR_PURPLE + mapgen = /datum/map_generator/single_biome/plasma_giant + default_baseturf = /turf/open/chasm/gas_giant/plasma + weight = 0 + icon_state = "globe" + preserve_level = TRUE + landing_sound = 'sound/effects/planet_landing_1.ogg' diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm index d95f35996903..d4ebcb8d4735 100644 --- a/code/modules/overmap/ships/controlled_ship_datum.dm +++ b/code/modules/overmap/ships/controlled_ship_datum.dm @@ -1,6 +1,3 @@ -///Name of the file used for ship name random selection -#define SHIP_NAMES_FILE "ship_names.json" - /** * # Simulated overmap ship * @@ -66,12 +63,6 @@ ///Time that next job slot change can occur COOLDOWN_DECLARE(job_slot_adjustment_cooldown) - - - - - - /datum/overmap/ship/controlled/Rename(new_name, force = FALSE) var/oldname = name if(!..() || (!COOLDOWN_FINISHED(src, rename_cooldown) && !force)) @@ -105,8 +96,8 @@ qdel(src) // Can't return INITIALIZE_HINT_QDEL here since this isn't ACTUAL initialisation. Considering changing the name of the proc. return refresh_engines() + ship_account = new(name, source_template.starting_funds) - ship_account = new(name, 2000) #ifdef UNIT_TESTS Rename("[source_template]") #else @@ -189,9 +180,6 @@ Dock(E) /datum/overmap/ship/controlled/burn_engines(percentage = 100, deltatime) - if(docked_to || docking) - CRASH("[src] burned engines while docking or docked!") - var/thrust_used = 0 //The amount of thrust that the engines will provide with one burn refresh_engines() calculate_avg_fuel() diff --git a/code/modules/overmap/ships/ship_datum.dm b/code/modules/overmap/ships/ship_datum.dm index 8fa4ee07afa4..0d2ef4370b35 100644 --- a/code/modules/overmap/ships/ship_datum.dm +++ b/code/modules/overmap/ships/ship_datum.dm @@ -35,7 +35,7 @@ /datum/overmap/ship/Destroy() . = ..() if(movement_callback_id) - deltimer(movement_callback_id) + deltimer(movement_callback_id, SSovermap_movement) /datum/overmap/ship/complete_dock(datum/overmap/dock_target, datum/docking_ticket/ticket) . = ..() @@ -63,8 +63,8 @@ var/offset = 1 if(movement_callback_id) var/previous_time = 1 / MAGNITUDE(speed_x, speed_y) - offset = clamp(timeleft(movement_callback_id) / previous_time, 0, 1) - deltimer(movement_callback_id) + offset = clamp(timeleft(movement_callback_id, SSovermap_movement) / previous_time, 0, 1) + deltimer(movement_callback_id, SSovermap_movement) movement_callback_id = null //just in case speed_x = min(max_speed, speed_x + n_x) @@ -78,11 +78,11 @@ token.update_icon_state() update_visuals() - if(is_still() || QDELING(src) || movement_callback_id) + if(is_still() || QDELING(src) || movement_callback_id || docked_to || docking) return var/timer = 1 / MAGNITUDE(speed_x, speed_y) * offset - movement_callback_id = addtimer(CALLBACK(src, .proc/tick_move), timer, TIMER_STOPPABLE) + movement_callback_id = addtimer(CALLBACK(src, .proc/tick_move), timer, TIMER_STOPPABLE, SSovermap_movement) /** * Called by [/datum/overmap/ship/proc/adjust_speed], this continually moves the ship according to its speed @@ -90,14 +90,14 @@ /datum/overmap/ship/proc/tick_move() if(is_still() || QDELING(src) || docked_to) adjust_speed(-speed_x, -speed_y) - deltimer(movement_callback_id) + deltimer(movement_callback_id, SSovermap_movement) movement_callback_id = null return overmap_move(x + SIGN(speed_x), y + SIGN(speed_y)) update_visuals() if(movement_callback_id) - deltimer(movement_callback_id) + deltimer(movement_callback_id, SSovermap_movement) //Queue another movement var/current_speed = MAGNITUDE(speed_x, speed_y) @@ -105,7 +105,7 @@ return var/timer = 1 / current_speed - movement_callback_id = addtimer(CALLBACK(src, .proc/tick_move), timer, TIMER_STOPPABLE) + movement_callback_id = addtimer(CALLBACK(src, .proc/tick_move), timer, TIMER_STOPPABLE, SSovermap_movement) token.update_screen() /** @@ -145,14 +145,14 @@ * Returns the estimated time in deciseconds to the next tile at current speed, or approx. time until reaching the destination when on autopilot */ /datum/overmap/ship/proc/get_eta() - . += timeleft(movement_callback_id) + . += timeleft(movement_callback_id, SSovermap_movement) if(!.) return "--:--" . /= 10 //they're in deciseconds return "[add_leading(num2text((. / 60) % 60), 2, "0")]:[add_leading(num2text(. % 60), 2, "0")]" /datum/overmap/ship/process(delta_time) - if(burn_direction == BURN_STOP && is_still()) + if((burn_direction == BURN_STOP && is_still()) || docked_to || docking) change_heading(BURN_NONE) return @@ -203,6 +203,9 @@ * * deltatime - The time since the last burn tick */ /datum/overmap/ship/proc/burn_engines(percentage = 100, deltatime) + if(docked_to || docking) + CRASH("Ship burned engines while docking or docked!") + return acceleration_speed * (percentage / 100) * deltatime /datum/overmap/ship/proc/change_heading(direction) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index f520fb009ba8..ab1a5c16c7cd 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -219,7 +219,7 @@ GLOBAL_LIST_EMPTY(alldepartments) //Prevents copypasta for evil faxes /obj/machinery/photocopier/faxmachine/proc/handle_animation() flick(print_anim, src) - playsound(loc, 'goon/sound/machinery/printer_dotmatrix.ogg', 50, 1) + playsound(loc, 'sound/machines/printer.ogg', 50, 1) /obj/machinery/photocopier/faxmachine/proc/handle_copying(obj/item/incoming) use_power(active_power_usage) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index f791aa9440a1..05caf78a818d 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -462,13 +462,9 @@ charge = 0 update_icon() -/obj/item/stock_parts/cell/gun/SolGov +/obj/item/stock_parts/cell/gun/solgov name = "SolGov power cell" - icon = 'icons/obj/power.dmi' - icon_state = "g-cell" - maxcharge = 8000 - custom_materials = list(/datum/material/glass=60) - chargerate = 2000 + icon_state = "g-sg-cell" /obj/item/stock_parts/cell/gun/large name = "extra-large weapon power cell" diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index c25a2fdb82b0..a50337982ba7 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -4,7 +4,7 @@ /obj/machinery/power/solar name = "solar panel" desc = "A solar panel. Generates electricity when in contact with sunlight." - icon = 'goon/icons/obj/power.dmi' + icon = 'icons/obj/machines/oldsolars.dmi' icon_state = "sp_base" density = TRUE use_power = NO_POWER_USE @@ -227,7 +227,7 @@ /obj/item/solar_assembly name = "solar panel assembly" desc = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker." - icon = 'goon/icons/obj/power.dmi' + icon = 'icons/obj/machines/oldsolars.dmi' icon_state = "sp_base" item_state = "electropack" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 6e636cd53d88..4b3f9b760fd6 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -6,7 +6,7 @@ /obj/machinery/power/tracker name = "solar tracker" desc = "A solar directional tracker." - icon = 'goon/icons/obj/power.dmi' + icon = 'icons/obj/machines/oldsolars.dmi' icon_state = "tracker" density = TRUE use_power = NO_POWER_USE diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm index 74578c86aaa5..d58a1464f529 100644 --- a/code/modules/projectiles/ammunition/ballistic/smg.dm +++ b/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -26,29 +26,29 @@ caliber = "4.73x33mm caseless" projectile_type = /obj/projectile/bullet/c47x33mm -/obj/item/ammo_casing/caseless/c556mmHITP - name = "5.56mm HITP caseless round" - desc = "A 5.56mm HITP caseless round." +/obj/item/ammo_casing/caseless/c556mm + name = "5.56mm caseless round" + desc = "A 5.56mm caseless round." icon_state = "caseless" - caliber = "5.56mm HITP caseless" - projectile_type = /obj/projectile/bullet/c556mmHITP + caliber = "5.56mm caseless" + projectile_type = /obj/projectile/bullet/c556mm -/obj/item/ammo_casing/caseless/c556mmHITP/surplus +/obj/item/ammo_casing/caseless/c556mm/surplus name = "5.56mm HITP caseless surplus round" desc = "A 5.56mm HITP caseless surplus round." - projectile_type = /obj/projectile/bullet/c556mmHITP_surplus + projectile_type = /obj/projectile/bullet/c556mm_surplus -/obj/item/ammo_casing/caseless/c556mmHITP/ap +/obj/item/ammo_casing/caseless/c556mm/ap name = "5.56mm HITP caseless armor piercing round" desc = "A 5.56mm HITP caseless armor piercing round." - projectile_type = /obj/projectile/bullet/c556mmHITP_ap + projectile_type = /obj/projectile/bullet/c556mm_ap -/obj/item/ammo_casing/caseless/c556mmHITP/hp +/obj/item/ammo_casing/caseless/c556mm/hp name = "5.56mm HITP caseless hollow-point round" desc = "A 5.56mm HITP caseless hollow-point round." - projectile_type = /obj/projectile/bullet/c556mmHITP_hp + projectile_type = /obj/projectile/bullet/c556mm_hp -/obj/item/ammo_casing/caseless/c556mmHITP/rubbershot +/obj/item/ammo_casing/caseless/c556mm/rubbershot name = "5.56mm HITP rubber round" desc = "A 5.56mm HITP caseless rubber round." - projectile_type = /obj/projectile/bullet/c556mmHITP/rubbershot + projectile_type = /obj/projectile/bullet/c556mm/rubbershot diff --git a/code/modules/projectiles/ammunition/special/gauss.dm b/code/modules/projectiles/ammunition/special/gauss.dm index 410bea4313ce..9a81b23e54aa 100644 --- a/code/modules/projectiles/ammunition/special/gauss.dm +++ b/code/modules/projectiles/ammunition/special/gauss.dm @@ -19,8 +19,8 @@ /obj/item/ammo_casing/caseless/gauss/slug name = "ferromagnetic slug" desc = "A large metal slug." - caliber = "lance" + caliber = "slug" icon_state = "gauss-slug" projectile_type = /obj/projectile/bullet/gauss/slug auto_rotate = TRUE - energy_cost = 800 + energy_cost = 700 diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index ce20c75b13b9..3e3273eef332 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -220,34 +220,34 @@ name = "ammo box (5.56mm HITP caseless)" desc = "A box of 5.56mm HITP caseless ammo, a SolGov standard." icon_state = "556mmHITPbox" - ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP + ammo_type = /obj/item/ammo_casing/caseless/c556mm max_ammo = 30 /obj/item/ammo_box/c556mmHITP/surplus name = "ammo box (5.56mm HITP caseless surplus)" desc = "A box of low-quality 5.56mm HITP caseless ammo." icon_state = "556mmHITPbox-surplus" - ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/surplus + ammo_type = /obj/item/ammo_casing/caseless/c556mm/surplus /obj/item/ammo_box/c556mmHITP/rubbershot name = "ammo box (5.56mm HITP caseless rubbershot)" desc = "A box of 5.56mm HITP caseless rubbershot ammo, designed to disable targets without causing serious damage." icon_state = "556mmHITPbox-rubbershot" - ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/rubbershot + ammo_type = /obj/item/ammo_casing/caseless/c556mm/rubbershot max_ammo = 30 /obj/item/ammo_box/c556mmHITP/ap name = "ammo box (5.56mm HITP caseless AP)" desc = "A box of 5.56mm HITP caseless armor piercing ammo, designed to penetrate through armor at the cost of total damage." icon_state = "556mmHITPbox-ap" - ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/ap + ammo_type = /obj/item/ammo_casing/caseless/c556mm/ap max_ammo = 30 /obj/item/ammo_box/c556mmHITP/hp name = "ammo box (5.56mm HITP caseless HP)" desc = "A box of 5.56mm HITP caseless hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration." icon_state = "556mmHITPbox-hp" - ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/hp + ammo_type = /obj/item/ammo_casing/caseless/c556mm/hp max_ammo = 30 /obj/item/ammo_box/a40mm @@ -306,3 +306,12 @@ caliber = "9mm" max_ammo = 4 custom_materials = list(/datum/material/iron = 20000) + +/obj/item/ammo_box/amagpellet_claris + name = "claris speed loader (ferromagnetic pellet)" + desc = "Designed to quickly reload the claris." + icon_state = "claris-sl" + ammo_type = /obj/item/ammo_casing/caseless/gauss + max_ammo = 22 + multiple_sprites = AMMO_BOX_FULL_EMPTY + item_flags = NO_MAT_REDEMPTION diff --git a/code/modules/projectiles/boxes_magazines/external/gauss.dm b/code/modules/projectiles/boxes_magazines/external/gauss.dm index e3f41559da4e..1d5800e75bbd 100644 --- a/code/modules/projectiles/boxes_magazines/external/gauss.dm +++ b/code/modules/projectiles/boxes_magazines/external/gauss.dm @@ -5,3 +5,23 @@ caliber = "pellet" max_ammo = 24 multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/modelh + name = "model-h magazine (ferromagnetic slugs)" + icon_state = "smallmagmag" + ammo_type = /obj/item/ammo_casing/caseless/gauss/slug + caliber = "slug" + max_ammo = 10 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/gar + name = "gar tube magazine (ferromagnetic lances)" + icon_state = "gar-mag" + ammo_type = /obj/item/ammo_casing/caseless/gauss/lance + caliber = "lance" + max_ammo = 32 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/gar/update_icon() + . = ..() + icon_state = "gar-mag-[!!ammo_count()]" diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index 3b41a9cb2c4e..143c124420f0 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -100,10 +100,10 @@ icon_state = "drum45" /obj/item/ammo_box/magazine/pistol556mm - name = "handgun magazine (5.56mm HITP caseless)" + name = "handgun magazine (5.56mm caseless)" icon_state = "5.56mmHITP-12" //ok i did it - ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP - caliber = "5.56mm HITP caseless" + ammo_type = /obj/item/ammo_casing/caseless/c556mm + caliber = "5.56mm caseless" max_ammo = 12 /obj/item/ammo_box/magazine/pistol556mm/update_icon() diff --git a/code/modules/projectiles/boxes_magazines/internal/gauss.dm b/code/modules/projectiles/boxes_magazines/internal/gauss.dm new file mode 100644 index 000000000000..06527ae49197 --- /dev/null +++ b/code/modules/projectiles/boxes_magazines/internal/gauss.dm @@ -0,0 +1,5 @@ +/obj/item/ammo_box/magazine/internal/claris + name = "claris internal magazine" + ammo_type = /obj/item/ammo_casing/caseless/gauss + caliber = "pellet" + max_ammo = 22 diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm index f1f62669469a..cb21b5d1a867 100644 --- a/code/modules/projectiles/guns/ballistic/gauss.dm +++ b/code/modules/projectiles/guns/ballistic/gauss.dm @@ -6,18 +6,81 @@ slot_flags = 0 mag_type = /obj/item/ammo_box/magazine/gauss fire_sound = 'sound/weapons/gun/gauss/magrifle.ogg' - vary_fire_sound = TRUE + load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg' can_suppress = FALSE burst_size = 1 fire_delay = 3 spread = 0 - recoil = 0.1 mag_display = TRUE empty_indicator = TRUE - empty_alarm = TRUE weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_BULKY charge_sections = 4 ammo_x_offset = 2 + +/obj/item/gun/ballistic/automatic/powered/gauss/modelh + name = "Model H" + desc = "Standard issue pistol of the Solarian confederation. Its unique ability to fire slugs instead of pellets make it effective in taking down unarmored targets, but can be useless against armored ones. This also makes it drain battery very fast, be careful. Chambered in ferromagnetic slugs." + mag_type = /obj/item/ammo_box/magazine/modelh + + icon_state = "model-h" + item_state = "model-h" + fire_sound = 'sound/weapons/gun/gauss/modelh.ogg' + load_sound = 'sound/weapons/gun/gauss/pistol_reload.ogg' + + cell_type = /obj/item/stock_parts/cell/gun/solgov + + slot_flags = ITEM_SLOT_BELT + + w_class = WEIGHT_CLASS_SMALL + fire_delay = 0 //pistol + + mag_display = FALSE + empty_indicator = FALSE + + +/obj/item/gun/ballistic/automatic/powered/gauss/claris + name = "Claris" + desc = "A antiquated solarian rifle. Just as the founding Solarians intended. Chambered in ferromagnetic pellets." + mag_type = /obj/item/ammo_box/magazine/internal/claris + + icon = 'icons/obj/guns/48x32guns.dmi' + icon_state = "claris" + item_state = "claris" + fire_sound = 'sound/weapons/gun/gauss/claris.ogg' + load_sound = 'sound/weapons/gun/gauss/sniper_reload.ogg' + + cell_type = /obj/item/stock_parts/cell/gun/solgov + fire_delay = 2 + + bolt_type = BOLT_TYPE_NO_BOLT + internal_magazine = TRUE + casing_ejector = FALSE + + mag_display = FALSE + empty_indicator = FALSE + +/obj/item/gun/ballistic/automatic/powered/gauss/gar + name = "Solar 'GAR' Assualt Rifle" + desc = "A unusally modern, for the solar confederation, assualt rifle. Fires ferromagnetic lances at alarming speeds in every sense of the word. Chambered in ferromagnetic lances." + mag_type = /obj/item/ammo_box/magazine/gar + + icon = 'icons/obj/guns/48x32guns.dmi' + icon_state = "gar" + item_state = "gar" + fire_sound = 'sound/weapons/gun/gauss/gar.ogg' + load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg' + + cell_type = /obj/item/stock_parts/cell/gun/solgov + + burst_size = 2 + fire_delay = 2 + actions_types = list() + + empty_indicator = FALSE + +/obj/item/gun/ballistic/automatic/powered/gauss/gar/ComponentInitialize() + . = ..() + AddComponent(/datum/component/automatic_fire, 0.2 SECONDS) //setiting this to 0.1 breaks auotfire, not sure why, so we use the standard fire rate but in 2 shot bursts to shoot 'faster' diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 8f75f05a04c7..760e4a62c944 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -52,7 +52,7 @@ fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg' w_class = WEIGHT_CLASS_BULKY can_suppress = FALSE - pin = /obj/item/firing_pin/implant/pindicate + pin = /obj/item/firing_pin burst_size = 1 fire_delay = 0 casing_ejector = FALSE @@ -97,7 +97,11 @@ sleep(20) return OXYLOSS +/obj/item/gun/ballistic/rocketlauncher/solgov + name = "Panzerfaust XII" + desc = "The standard recoiless rifle of the Solarian Confederation. Legend goes that every couple of decades, the bureaucracy changes a small part of the rifle, then bumps up the number. Chambered in rockets." - - + icon = 'icons/obj/guns/48x32guns.dmi' + icon_state = "panzerfaust" + item_state = "panzerfaust" diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 7b173775fbab..24725cbbc434 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -171,12 +171,17 @@ . += "Alt-click to use \the [src] vox hailer." /obj/item/gun/ballistic/automatic/pistol/solgov - name = "\improper SolGov M9C" - desc = "Known formally as the M9A5C, this is a compact caseless ammo handgun made for switching to when your primary runs empty on it's mag." - icon_state = "solm9c" + name = "\improper Pistole C" + desc = "A favorite of the Terran Regency, but despised by the Solarian bureaucracy. Was taken out of standard service several centruries ago, and is issued in low numbers in the military. However, it is popular with civillians. Chambered in 5.56mm caseless." + icon_state = "pistole-c" weapon_weight = WEAPON_LIGHT w_class = WEIGHT_CLASS_SMALL mag_type = /obj/item/ammo_box/magazine/pistol556mm + fire_sound = 'sound/weapons/gun/pistol/pistolec.ogg' + +/obj/item/gun/ballistic/automatic/pistol/solgov/old + desc = "A favorite of the Terran Regency, but despised by the Solarian bureaucracy. Was taken out of standard service several centruries ago, and is issued in low numbers in the military. However, it is popular with civillians. Chambered in 5.56mm caseless." + icon_state = "pistole-c-old" /obj/item/gun/ballistic/automatic/pistol/tec9 name = "\improper TEC9 machine pistol" diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index ecf7e647bdde..6f3c7667245b 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -15,8 +15,9 @@ can_bayonet = TRUE knife_x_offset = 20 knife_y_offset = 12 - internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit + internal_cell = TRUE custom_price = 750 + w_class = WEIGHT_CLASS_BULKY var/overheat_time = 16 var/holds_charge = FALSE var/unique_frequency = FALSE // modified by KA modkits @@ -238,6 +239,22 @@ /obj/projectile/kinetic/mech range = 5 +/obj/projectile/kinetic/mech/strike_thing(atom/target) //has no skill check for mechs + var/turf/target_turf = get_turf(target) + if(!target_turf) + target_turf = get_turf(src) + if(kinetic_gun) + var/list/mods = kinetic_gun.get_modkits() + for(var/obj/item/borg/upgrade/modkit/M in mods) + M.projectile_strike_predamage(src, target_turf, target, kinetic_gun) + for(var/obj/item/borg/upgrade/modkit/M in mods) + M.projectile_strike(src, target_turf, target, kinetic_gun) + if(ismineralturf(target_turf)) + var/turf/closed/mineral/M = target_turf + M.gets_drilled(firer, TRUE) + var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf) + K.color = color + //Modkits /obj/item/borg/upgrade/modkit name = "kinetic accelerator modification kit" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 15b314bd135f..4551014cafea 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -8,6 +8,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/lasergun) ammo_x_offset = 1 shaded_charge = 1 + supports_variations = VOX_VARIATION /obj/item/gun/energy/laser/practice name = "practice laser gun" diff --git a/code/modules/projectiles/guns/powered.dm b/code/modules/projectiles/guns/powered.dm index ff268746561a..31ab879bb8cc 100644 --- a/code/modules/projectiles/guns/powered.dm +++ b/code/modules/projectiles/guns/powered.dm @@ -5,6 +5,7 @@ var/obj/item/stock_parts/cell/cell var/cell_type = /obj/item/stock_parts/cell/gun var/charge_sections = 3 + var/empty_battery_sound = FALSE // play empty alarm if no battery var/shaded_charge = FALSE //if this gun uses a stateful charge bar for more detail var/automatic_charge_overlays = TRUE //Do we handle overlays with base update_icon()? @@ -44,7 +45,8 @@ /obj/item/gun/ballistic/automatic/powered/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) var/obj/item/ammo_casing/caseless/gauss/shot = chambered - cell.use(shot.energy_cost) + if(shot?.energy_cost) + cell.use(shot.energy_cost) return ..() /obj/item/gun/ballistic/automatic/powered/get_cell() diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 18057ac93fef..d17f94af19ae 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -17,6 +17,9 @@ ricochet_chance = 80 reflectable = REFLECT_NORMAL +/obj/projectile/beam/throw_atom_into_space() + return + /obj/projectile/beam/laser tracer_type = /obj/effect/projectile/tracer/laser diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 440b48475ea6..9b39aae37146 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -1,9 +1,12 @@ /obj/projectile/bullet name = "bullet" - icon_state = "bullet" + icon_state = "gauss" damage = 60 + speed = 0.4 damage_type = BRUTE nodamage = FALSE + light_system = MOVABLE_LIGHT + light_color = COLOR_VERY_SOFT_YELLOW flag = "bullet" hitsound_wall = "ricochet" impact_effect_type = /obj/effect/temp_visual/impact_effect diff --git a/code/modules/projectiles/projectile/bullets/gauss.dm b/code/modules/projectiles/projectile/bullets/gauss.dm index f7c26e4c8020..3d4409b3471c 100644 --- a/code/modules/projectiles/projectile/bullets/gauss.dm +++ b/code/modules/projectiles/projectile/bullets/gauss.dm @@ -10,9 +10,12 @@ name = "ferromagnetic lance" icon_state = "redtrac" damage = 30 - speed = 0.4 + armour_penetration = 0 + speed = 0.2 /obj/projectile/bullet/gauss/slug name = "ferromagnetic slug" icon_state = "gauss-slug" damage = 50 + armour_penetration = -50 + speed = 0.8 diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 032c4fa16efa..ca3db2176a47 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -7,7 +7,7 @@ // 7.62 (Nagant Rifle) /obj/projectile/bullet/a762 - name = "7.62x54mm bullet" // WS Edit - Whitesands + name = "7.62x54mm bullet" damage = 60 /obj/projectile/bullet/a300 diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 63d558cfac62..b9d77253fe28 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -19,26 +19,26 @@ damage = 30 armour_penetration = 40 -/obj/projectile/bullet/c556mmHITP +/obj/projectile/bullet/c556mm name = "5.56mm HITP bullet" damage = 20 armour_penetration = 0 -/obj/projectile/bullet/c556mmHITP_surplus +/obj/projectile/bullet/c556mm_surplus name = "5.56mm HITP surplus bullet" damage = 15 -/obj/projectile/bullet/c556mmHITP_ap +/obj/projectile/bullet/c556mm_ap name = "5.56mm HITP AP bullet" damage = 15 armour_penetration = 40 -/obj/projectile/bullet/c556mmHITP_hp +/obj/projectile/bullet/c556mm_hp name = "5.56mm HITP hollow-point bullet" damage = 30 armour_penetration = -50 -/obj/projectile/bullet/c556mmHITP/rubbershot +/obj/projectile/bullet/c556mm/rubbershot name = "5.56mm HITP rubber bullet" damage = 5 stamina = 20 diff --git a/code/modules/projectiles/projectile/bullets/turret.dm b/code/modules/projectiles/projectile/bullets/turret.dm new file mode 100644 index 000000000000..916f68af9b4a --- /dev/null +++ b/code/modules/projectiles/projectile/bullets/turret.dm @@ -0,0 +1,12 @@ +//folder for turret bullets, so we're not pulling from Random Files + +/obj/projectile/bullet/turret + name = "bullet" //taking name suggestions + damage = 60 //this is on par with the old projectile + +/obj/projectile/bullet/turret/rubber + name = "rubbershot bullet" + damage = 5 //"less than lethal" + stamina = 30 + + diff --git a/code/modules/projectiles/projectile/special/curse.dm b/code/modules/projectiles/projectile/special/curse.dm index 7d543f3aa42c..1993176de157 100644 --- a/code/modules/projectiles/projectile/special/curse.dm +++ b/code/modules/projectiles/projectile/special/curse.dm @@ -60,3 +60,8 @@ . = ..() if (. == BULLET_ACT_HIT) finale() + +/obj/projectile/curse_hand/phantom + name = "phantom hand" + damage = 15 + paralyze = 5 diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 163d91105342..614cb298fd05 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -331,19 +331,6 @@ return if(M.has_bane(BANE_SALT)) M.mind.disrupt_spells(-200) - if (issquidperson(M)) - if(reac_volume < 5) - return - if (method == INGEST) - to_chat(M, "Your tongue shrivels as you taste the salt!") - M.adjustFireLoss(reac_volume/2, TRUE) - else if (method == TOUCH) - M.adjustFireLoss(reac_volume/2, TRUE) - if(!M.incapacitated()) - var/obj/item/I = M.get_active_held_item() - M.throw_item(get_ranged_target_turf(M, pick(GLOB.alldirs), rand(1, 3))) - to_chat(M, "The salt causes your arm to spasm! It burns!") - M.log_message("threw [I] due to a Muscle Spasm", INDIVIDUAL_ATTACK_LOG) /datum/reagent/consumable/sodiumchloride/expose_turf(turf/T, reac_volume) //Creates an umbra-blocking salt pile if(!istype(T)) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 6f50d6bc0c62..a81add0b3d52 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -577,8 +577,8 @@ /datum/species/moth, /datum/species/pod, /datum/species/jelly, - /datum/species/abductor, - /datum/species/squid) + /datum/species/abductor + ) process_flags = ORGANIC | SYNTHETIC /datum/reagent/mutationtoxin/lizard @@ -667,13 +667,6 @@ race = /datum/species/ipc process_flags = ORGANIC | SYNTHETIC -/datum/reagent/mutationtoxin/squid - name = "Squid Mutation Toxin" - description = "A salty toxin." - color = "#5EFF3B" //RGB: 94, 255, 59 - race = /datum/species/squid - process_flags = ORGANIC | SYNTHETIC - /datum/reagent/mutationtoxin/kepi //crying name = "Kepori Mutation Toxin" description = "A feathery toxin." diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index 7ca683dac983..57df3331c799 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -4,7 +4,7 @@ var/list/required_catalysts = new/list() // Both of these variables are mostly going to be used with slime cores - but if you want to, you can use them for other things - var/required_container = null // the exact container path required for the reaction to happen + var/obj/item/reagent_containers/required_container = null // the exact container path required for the reaction to happen var/required_other = 0 // an integer required for the reaction to happen var/mob_react = TRUE //Determines if a chemical reaction can occur inside a mob diff --git a/code/modules/reagents/reagent_containers/jug.dm b/code/modules/reagents/reagent_containers/jug.dm new file mode 100644 index 000000000000..4c524dff9c44 --- /dev/null +++ b/code/modules/reagents/reagent_containers/jug.dm @@ -0,0 +1,141 @@ +/obj/item/reagent_containers/glass/chem_jug + name = "chemical jug" + desc = "A large jug used for storing bulk ammounts chemicals. Provided with a tamper seal which ensures that the contents are pure" + icon = 'icons/obj/chem_jug.dmi' + icon_state = "chem_jug" + item_state = "sheet-plastic" + w_class = WEIGHT_CLASS_BULKY + reagent_flags = REFILLABLE | DUNKABLE + throw_range = 2 + volume = 150 + amount_per_transfer_from_this = 25 + possible_transfer_amounts = list(25,50,75,100,150) + custom_materials = list(/datum/material/plastic=1000) + fill_icon_thresholds = null + can_have_cap = TRUE + cap_on = TRUE + var/tamper = TRUE + var/tamper_cap_icon_state = "chem_jug_cap" + cap_icon_state = "chem_jug_cap_tamper" + drop_sound = 'sound/items/handling/book_drop.ogg' + pickup_sound = 'sound/items/handling/device_pickup.ogg' + lefthand_file = 'icons/mob/inhands/misc/sheets_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/sheets_righthand.dmi' + +/obj/item/reagent_containers/glass/chem_jug/AltClick(mob/user) + . = ..() + if(tamper && !cap_on) + tamper = FALSE + cap_overlay = mutable_appearance(icon, tamper_cap_icon_state) + playsound(src, 'sound/items/poster_ripped.ogg', 50, 1) + to_chat(user, "You rip the tamper seal off of [src].") + +/obj/item/reagent_containers/glass/chem_jug/examine(mob/user) + . = ..() + if(tamper) + if(!cap_on) + . += "The tamper seal hasn't been applied yet." + return + . += "The tamper seal is intact." + else + . += "The tamper seal is broken." + + +/obj/item/reagent_containers/glass/chem_jug/SplashReagents(atom/target, thrown = FALSE) + if(!reagents || !reagents.total_volume || !spillable) + return + + if(ismob(target) && target.reagents) + if(thrown) + reagents.total_volume *= rand(1,3) * 0.1 //little makes contact with the target + var/mob/M = target + var/R + playsound(src, 'sound/items/glass_splash.ogg', 50, 1) + target.visible_message("[M] is splashed with something!", \ + "[M] is splashed with something!") + for(var/datum/reagent/A in reagents.reagent_list) + R += "[A.type] ([num2text(A.volume)])," + + if(thrownby) + log_combat(thrownby, M, "splashed", R) + reagents.expose(target, TOUCH, 0.3) + + else if(bartender_check(target) && thrown) + visible_message("[src] lands onto the [target.name] without spilling a single drop.") + return + + else + if(isturf(target) && reagents.reagent_list.len && thrownby) + log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]") + log_game("[key_name(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [AREACOORD(target)].") + message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [ADMIN_VERBOSEJMP(target)].") + playsound(src, 'sound/items/glass_splash.ogg', 50, 1) + visible_message("[src] spills its contents all over [target].") + reagents.expose(target, TOUCH, 0.3) + if(QDELETED(src)) + return + + reagents.remove_any(45) + +/obj/item/reagent_containers/glass/chem_jug/open + cap_on = FALSE + +/obj/item/reagent_containers/glass/chem_jug/carbon + name = "chemical jug (carbon)" + icon_state = "chem_jug_carbon" + list_reagents = list(/datum/reagent/carbon = 150) + +/obj/item/reagent_containers/glass/chem_jug/oxygen + name = "chemical jug (oxygen)" + icon_state = "chem_jug_oxygen" + list_reagents = list(/datum/reagent/oxygen = 150) + +/obj/item/reagent_containers/glass/chem_jug/nitrogen + name = "chemical jug (nitrogen)" + icon_state = "chem_jug_nitrogen" + list_reagents = list(/datum/reagent/nitrogen = 150) + +/obj/item/reagent_containers/glass/chem_jug/hydrogen + name = "chemical jug (hydrogen)" + icon_state = "chem_jug_hydrogen" + list_reagents = list(/datum/reagent/hydrogen = 150) + +/obj/item/reagent_containers/glass/chem_jug/radium + name = "chemical jug (radium)" + icon_state = "chem_jug_radium" + list_reagents = list(/datum/reagent/radium = 150) + +/obj/item/reagent_containers/glass/chem_jug/aluminium + name = "chemical jug (aluminium)" + icon_state = "chem_jug_aluminium" + list_reagents = list(/datum/reagent/aluminium = 150) + +/obj/item/reagent_containers/glass/chem_jug/chlorine + name = "chemical jug (chlorine)" + icon_state = "chem_jug_chlorine" + list_reagents = list(/datum/reagent/chlorine = 150) + +/obj/item/reagent_containers/glass/chem_jug/copper + name = "chemical jug (copper)" + icon_state = "chem_jug_copper" + list_reagents = list(/datum/reagent/copper = 150) + +/obj/item/reagent_containers/glass/chem_jug/bromine + name = "chemical jug (bromine)" + icon_state = "chem_jug_bromine" + list_reagents = list(/datum/reagent/bromine = 150) + +/obj/item/reagent_containers/glass/chem_jug/iodine + name = "chemical jug (iodine)" + icon_state = "chem_jug_iodine" + list_reagents = list(/datum/reagent/iodine = 150) + +/obj/item/reagent_containers/glass/chem_jug/potassium + name = "chemical jug (potassium)" + icon_state = "chem_jug_potassium" + list_reagents = list(/datum/reagent/potassium = 150) + +/obj/item/reagent_containers/glass/chem_jug/sulfur + name = "chemical jug (sulfur)" + icon_state = "chem_jug_sulfur" + list_reagents = list(/datum/reagent/sulfur = 150) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index daab6997766c..3b7994eef201 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -20,23 +20,38 @@ other types of metals and chemistry for reagents). //DESIGNS ARE GLOBAL. DO NOT CREATE OR DESTROY THEM AT RUNTIME OUTSIDE OF INIT, JUST REFERENCE THEM TO WHATEVER YOU'RE DOING! //why are you yelling? //DO NOT REFERENCE OUTSIDE OF SSRESEARCH. USE THE PROCS IN SSRESEARCH TO OBTAIN A REFERENCE. -/datum/design //Datum for object designs, used in construction - var/name = "Name" //Name of the created object. - var/desc = "Desc" //Description of the created object. - var/id = DESIGN_ID_IGNORE //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols - var/build_type = null //Flag as to what kind machine the design is built in. See defines. - var/list/materials = list() //List of materials. Format: "id" = amount. - var/construction_time //Amount of time required for building the object - var/build_path = null //The file path of the object that gets created - var/list/make_reagents = list() //Reagents produced. Format: "id" = amount. Currently only supported by the biogenerator. - var/list/category = null //Primarily used for Mech Fabricators, but can be used for anything - var/list/reagents_list = list() //List of reagents. Format: "id" = amount. +/datum/design //Datum for object designs, used in construction + /// Name of the created object + var/name = "Name" + /// Description of the created object + var/desc = null + /// The ID of the design. Used for quick reference. Alphanumeric, lower-case, no symbols + var/id = DESIGN_ID_IGNORE + /// Bitflags indicating what machines this design is compatable with. ([IMPRINTER]|[AWAY_IMPRINTER]|[PROTOLATHE]|[AWAY_LATHE]|[AUTOLATHE]|[MECHFAB]|[BIOGENERATOR]|[LIMBGROWER]|[SMELTER]) + var/build_type = null + /// List of materials required to create one unit of the product. Format is (typepath or caregory) -> amount + var/list/materials = list() + /// The amount of time required to create one unit of the product + var/construction_time + /// The typepath of the object produced by this design + var/build_path = null + /// List of reagents produced by this design. Currently only supported by the biogenerator + var/list/make_reagents = list() + /// What category this design falls under. Used for sorting in production machines, mostly the mechfab + var/list/category = null + /// List of reagents required to create one unit of the product + var/list/reagents_list = list() + /// The maximum number of units of whatever is produced by this can be produced in one go var/maxstack = 1 - var/lathe_time_factor = 1 //How many times faster than normal is this to build on the protolathe - var/dangerous_construction = FALSE //notify and log for admin investigations if this is printed. - var/departmental_flags = ALL //bitflags for deplathes. + /// How many times faster than normal is this to build on the protolathe + var/lathe_time_factor = 1 + /// Notify and log for admin investigations if this is printed + var/dangerous_construction = FALSE + /// Bitflags for deplathes. + var/departmental_flags = ALL var/list/datum/techweb_node/unlocked_by = list() - var/research_icon //Replaces the item icon in the research console + /// Replaces the item icon in the research console + var/research_icon var/research_icon_state var/icon_cache @@ -64,6 +79,13 @@ other types of metals and chemistry for reagents). sheet.send(user) return sheet.icon_tag(id) +/// Returns the description of the design +/datum/design/proc/get_description() + var/obj/object_build_item_path = build_path + + return isnull(desc) ? initial(object_build_item_path.desc) : desc + + //////////////////////////////////////// //Disks for transporting design datums// //////////////////////////////////////// diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 499673ab16fc..5e0947d7e378 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -586,6 +586,14 @@ build_path = /obj/item/storage/pill_bottle category = list("initial", "Medical", "Medical Designs") +/datum/design/chem_jug + name = "Chemical Jug" + id = "chem_jug" + build_type = AUTOLATHE | PROTOLATHE + materials = list(/datum/material/plastic = 4000) + build_path = /obj/item/reagent_containers/glass/chem_jug/open + category = list("initial", "Medical", "Medical Designs") + /datum/design/recorder name = "Universal Recorder" id = "recorder" diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index 4af718eb13f8..4f48995190dc 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -39,7 +39,7 @@ id = "digi_l_leg" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 25) - build_path = /obj/item/bodypart/leg/left/digitigrade + build_path = /obj/item/bodypart/leg/left/lizard/digitigrade category = list("initial",SPECIES_LIZARD) /datum/design/digitigrade/rightleg @@ -47,7 +47,7 @@ id = "digi_r_leg" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 25) - build_path = /obj/item/bodypart/leg/right/digitigrade + build_path = /obj/item/bodypart/leg/right/lizard/digitigrade category = list("initial",SPECIES_LIZARD) //Non-limb limb designs @@ -174,30 +174,6 @@ build_path = /obj/item/organ/ears/fox category = list("initial",SPECIES_HUMAN) -/datum/design/dwarf_gland - name = "Dwarf Gland" - id = "dwarfgland" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/synthflesh = 20, /datum/reagent/consumable/ethanol = 20) - build_path = /obj/item/organ/dwarfgland - category = list("initial",SPECIES_DWARF) - -/datum/design/dwarf_liver - name = "Dwarf Liver" - id = "dwarfliver" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/synthflesh = 20, /datum/reagent/consumable/ethanol = 20) - build_path = /obj/item/organ/liver/dwarf - category = list("initial",SPECIES_DWARF) - -/datum/design/dwarf_tongue - name = "Dwarf Tongue" - id = "dwarftongue" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/synthflesh = 10, /datum/reagent/consumable/ethanol = 10) - build_path = /obj/item/organ/tongue/dwarf - category = list("initial",SPECIES_DWARF) - /datum/design/lizard_tongue name = "Lizard Tongue" id = "lizardtongue" diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index f9c735054a3d..bd801e60995e 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -135,6 +135,26 @@ id = "vprosthetic_r_leg" build_path = /obj/item/bodypart/leg/right/robot/surplus/vox +/datum/design/prosthetic_l_arm/lizard + name = "Surplus Prosthetic Lizard Left Arm" + id = "lprosthetic_l_arm" + build_path = /obj/item/bodypart/l_arm/robot/surplus/lizard + +/datum/design/prosthetic_r_arm/lizard + name = "Surplus Prosthetic Lizard Right Arm" + id = "lprosthetic_r_arm" + build_path = /obj/item/bodypart/r_arm/robot/surplus/lizard + +/datum/design/prosthetic_l_leg/lizard + name = "Surplus Prosthetic Lizard Left Leg" + id = "lprosthetic_l_leg" + build_path = /obj/item/bodypart/leg/left/robot/surplus/lizard + +/datum/design/prosthetic_r_leg/lizard + name = "Surplus Prosthetic Lizard Right Leg" + id = "lprosthetic_r_leg" + build_path = /obj/item/bodypart/leg/right/robot/surplus/lizard + //Ripley /datum/design/ripley_chassis name = "Exosuit Chassis (APLU \"Ripley\")" diff --git a/code/modules/research/nanites/nanite_program_hub.dm b/code/modules/research/nanites/nanite_program_hub.dm index 8abdf924c79a..454d74bb824d 100644 --- a/code/modules/research/nanites/nanite_program_hub.dm +++ b/code/modules/research/nanites/nanite_program_hub.dm @@ -99,7 +99,7 @@ var/list/program_design = list() program_design["id"] = D.id program_design["name"] = D.name - program_design["desc"] = D.desc + program_design["desc"] = D.get_description() data["programs"][cat_name] += list(program_design) if(!length(data["programs"])) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b99960b812b5..2115a3c6aba4 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -136,7 +136,7 @@ Nothing else in the console has ID requirements. return else playsound(src, 'sound/machines/ping.ogg', 50, 3, -1) - visible_message("You insert [E] into a slot on the [src], producting [E.research] points from the extract's chemical makeup!") + visible_message("[user] inserts [E] into a slot on the [src]!", "You insert [E] into a slot on the [src], producting [E.research] points from the extract's chemical makeup!") stored_research.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = E.research)) slime_already_researched[E.type] = TRUE qdel(D) @@ -155,7 +155,7 @@ Nothing else in the console has ID requirements. return else playsound(src, 'sound/machines/ping.ogg', 50, 3, -1) - visible_message("You insert [E] into a slot on the [src], producting [E.research] points from the plant's genetic makeup!") + visible_message("[user] inserts [E] into a slot on the [src]!", "You insert [E] into a slot on the [src], producting [E.research] points from the plant's genetic makeup!") stored_research.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = E.research)) plant_already_researched[E.type] = TRUE qdel(D) @@ -164,6 +164,18 @@ Nothing else in the console has ID requirements. visible_message("[src] buzzes and displays a message: Genetic data already researched!") playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 3, -1) return + if(istype(D, /obj/item/assembly/signaler/anomaly)) + + var/obj/item/assembly/signaler/anomaly/anomaly = D + if(!stored_research) + visible_message("Warning: No Linked Server!") + return + + playsound(src, 'sound/machines/ping.ogg', 50, 3, -1) + visible_message("[user] inserts [anomaly] into a slot on the [src]!", "You insert [anomaly] into a slot on the [src], producting [anomaly.research] points!") + stored_research.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = anomaly.research)) + qdel(anomaly) + return if(istype(D, /obj/item/research_notes)) if(!stored_research) diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 4076ff881ff1..73d732e28a1f 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -11,17 +11,26 @@ var/starting_node = FALSE //Whether it's available without any research. var/list/prereq_ids = list() var/list/design_ids = list() - var/list/unlock_ids = list() //CALCULATED FROM OTHER NODE'S PREREQUISITES. Assoc list id = TRUE. - var/list/boost_item_paths = list() //Associative list, path = list(point type = point_value). - var/autounlock_by_boost = TRUE //boosting this will autounlock this node. - var/export_price = 0 //Cargo export price. - var/list/research_costs = list() //Point cost to research. type = amount - var/category = "Misc" //Category + /// CALCULATED FROM OTHER NODE'S PREREQUISITIES. Associated list id = TRUE + var/list/unlock_ids = list() + /// Associative list, path = list(point type = point_value) + var/list/boost_item_paths = list() + /// Boosting this will autounlock this node + var/autounlock_by_boost = TRUE + /// Cargo export price. + var/export_price = 0 + /// The points cost to research the node, type = amount + var/list/research_costs = list() + /// The category of the node + var/category = "Misc" + /// Whether or not this node should show on the wiki + var/show_on_wiki = TRUE /datum/techweb_node/error_node id = "ERROR" display_name = "ERROR" description = "This usually means something in the database has corrupted. If it doesn't go away automatically, inform Central Command for their techs to fix it ASAP(tm)" + show_on_wiki = FALSE /datum/techweb_node/proc/Initialize() //Make lists associative for lookup diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 309dd2fa415b..7588f32ab249 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -78,7 +78,7 @@ display_name = "Biological Technology" description = "What makes us tick." //the MC, silly! prereq_ids = list("base") - design_ids = list("sleeper", "chem_heater", "chem_master", "chem_dispenser", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox", "medipen_refiller", "prosthetic_l_arm", "prosthetic_r_arm", "prosthetic_l_leg", "prosthetic_r_leg", "kprosthetic_l_arm", "kprosthetic_r_arm", "kprosthetic_l_leg", "kprosthetic_r_leg", "vprosthetic_l_arm", "vprosthetic_r_arm", "vprosthetic_l_leg", "vprosthetic_r_leg") + design_ids = list("sleeper", "chem_heater", "chem_master", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox", "medipen_refiller", "prosthetic_l_arm", "prosthetic_r_arm", "prosthetic_l_leg", "prosthetic_r_leg", "kprosthetic_l_arm", "kprosthetic_r_arm", "kprosthetic_l_leg", "kprosthetic_r_leg", "vprosthetic_l_arm", "vprosthetic_r_arm", "vprosthetic_l_leg", "vprosthetic_r_leg", "lprosthetic_l_arm", "lprosthetic_r_arm", "lprosthetic_l_leg", "lprosthetic_r_leg") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -266,7 +266,7 @@ display_name = "Applied Bluespace Research" description = "Using bluespace to make things faster and better." prereq_ids = list("bluespace_basic", "engineering") - design_ids = list("bs_rped","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "roastingstick", "ore_silo", "biobag_holding", "engibag_holding", "plantbag_holding", "chembag_holding") + design_ids = list("bs_rped","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "roastingstick", "ore_silo", "chem_dispenser", "biobag_holding", "engibag_holding", "plantbag_holding", "chembag_holding") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) export_price = 5000 @@ -1003,6 +1003,9 @@ export_price = 5000 /////////////////////////Nanites///////////////////////// + +//Disabled pending nanite rework --Apogee-dev +/* /datum/techweb_node/nanite_base id = "nanite_base" display_name = "Basic Nanite Programming" @@ -1097,7 +1100,7 @@ export_price = 2500 hidden = TRUE experimental = TRUE - +*/ ////////////////////////Alien technology//////////////////////// /datum/techweb_node/alientech //AYYYYYYYYLMAOO tech id = "alientech" diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm index fd2a9726b4fa..50e855b2ab50 100644 --- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm @@ -104,11 +104,12 @@ //***Grave mounds. /obj/structure/closet/crate/grave name = "burial mound" - desc = "An marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?" + desc = "A marked patch of soil, adorned with a wooden cross" icon_state = "grave" dense_when_open = TRUE material_drop = /obj/item/stack/ore/glass/basalt material_drop_amount = 5 + opened = TRUE anchorable = FALSE anchored = TRUE locked = TRUE @@ -117,31 +118,20 @@ var/lead_tomb = FALSE var/first_open = FALSE -/obj/structure/closet/crate/grave/PopulateContents() //GRAVEROBBING IS NOW A FEATURE - ..() - new /obj/effect/decal/remains/human/grave(src) - switch(rand(1,7)) - if(1) - new /obj/item/coin/gold(src) - new /obj/item/storage/wallet(src) - if(2) - new /obj/item/clothing/glasses/meson(src) - if(3) - new /obj/item/coin/silver(src) - new /obj/item/shovel/spade(src) - if(4) - new /obj/item/storage/book/bible/booze(src) - if(5) - new /obj/item/clothing/neck/stethoscope(src) - new /obj/item/scalpel(src) - new /obj/item/hemostat(src) - - if(6) - new /obj/item/reagent_containers/glass/beaker(src) - new /obj/item/clothing/glasses/science(src) - if(7) - new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/clothing/mask/cigarette/rollie(src) +/obj/structure/closet/crate/grave/attackby(obj/item/W, mob/user, params) + .=..() + if(istype(W, /obj/item/screwdriver)) + if(!user.is_literate()) + to_chat(user, "You scratch illegibly on [src]!") + return + var/t = stripped_input(user, "What would you like the inscription to be?", name, null, 53) + if(user.get_active_held_item() != W) + return + if(!user.canUseTopic(src, BE_CLOSE)) + return + if(t) + desc = "[t]" + return /obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S, force = FALSE) if(!opened) @@ -190,14 +180,50 @@ dump_contents() return -/obj/structure/closet/crate/grave/lead_researcher +/obj/structure/closet/crate/grave/stone + name = "burial mound" + desc = "A marked patch of soil, adorned with a sandstone slab" + icon_state = "grave_lead" + +/obj/structure/closet/crate/grave/loot + name = "burial mound" + desc = "A marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?" + opened = FALSE + +/obj/structure/closet/crate/grave/loot/PopulateContents() //GRAVEROBBING IS NOW A FEATURE + ..() + new /obj/effect/decal/remains/human/grave(src) + switch(rand(1,7)) + if(1) + new /obj/item/coin/gold(src) + new /obj/item/storage/wallet(src) + if(2) + new /obj/item/clothing/glasses/meson(src) + if(3) + new /obj/item/coin/silver(src) + new /obj/item/shovel/spade(src) + if(4) + new /obj/item/storage/book/bible/booze(src) + if(5) + new /obj/item/clothing/neck/stethoscope(src) + new /obj/item/scalpel(src) + new /obj/item/hemostat(src) + + if(6) + new /obj/item/reagent_containers/glass/beaker(src) + new /obj/item/clothing/glasses/science(src) + if(7) + new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/clothing/mask/cigarette/rollie(src) + +/obj/structure/closet/crate/grave/loot/lead_researcher name = "ominous burial mound" desc = "Even in a place filled to the brim with graves, this one shows a level of preperation and planning that fills you with dread." icon_state = "grave_lead" lead_tomb = TRUE first_open = TRUE -/obj/structure/closet/crate/grave/lead_researcher/PopulateContents() //ADVANCED GRAVEROBBING +/obj/structure/closet/crate/grave/loot/lead_researcher/PopulateContents() //ADVANCED GRAVEROBBING ..() new /obj/effect/decal/cleanable/blood/gibs/old(src) new /obj/item/book/granter/crafting_recipe/boneyard_notes(src) diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index 40bd140176a4..a2ff0f588506 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -27,7 +27,12 @@ /datum/surgery_step/brainwash name = "brainwash" - implements = list(TOOL_HEMOSTAT = 85, TOOL_WIRECUTTER = 50, /obj/item/stack/packageWrap = 35, /obj/item/stack/cable_coil = 15) + implements = list( + TOOL_HEMOSTAT = 85, + /obj/item/soap = 60, //haha. brainwashing. get it? + TOOL_WIRECUTTER = 30, + /obj/item/stack/packageWrap = 20, + /obj/item/stack/cable_coil = 10) time = 20 SECONDS preop_sound = 'sound/surgery/hemostat1.ogg' success_sound = 'sound/surgery/hemostat1.ogg' diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm index 1fa86e8899bd..d1c882f96620 100644 --- a/code/modules/surgery/advanced/lobotomy.dm +++ b/code/modules/surgery/advanced/lobotomy.dm @@ -23,8 +23,12 @@ /datum/surgery_step/lobotomize name = "perform lobotomy" - implements = list(TOOL_SCALPEL = 85, /obj/item/melee/transforming/energy/sword = 55, /obj/item/kitchen/knife = 35, - /obj/item/shard = 25, /obj/item = 20) + implements = list( + TOOL_SCALPEL = 85, // there is no way this should be reasonable to do basically at all without a real surgery. ghetto lobotomy, for real? + /obj/item/melee/transforming/energy/sword = 25, + /obj/item/kitchen/knife = 15, + /obj/item/shard = 10, + /obj/item = 5) time = 10 SECONDS preop_sound = 'sound/surgery/scalpel1.ogg' success_sound = 'sound/surgery/scalpel2.ogg' diff --git a/code/modules/surgery/advanced/necrotic_revival.dm b/code/modules/surgery/advanced/necrotic_revival.dm index 41f63b1a5f3f..8018b0f910b2 100644 --- a/code/modules/surgery/advanced/necrotic_revival.dm +++ b/code/modules/surgery/advanced/necrotic_revival.dm @@ -18,7 +18,9 @@ /datum/surgery_step/bionecrosis name = "start bionecrosis" - implements = list(/obj/item/reagent_containers/syringe = 100, /obj/item/pen = 30) + implements = list( + /obj/item/reagent_containers/syringe = 100, + /obj/item/pen = 30) time = 50 chems_needed = list(/datum/reagent/toxin/zombiepowder, /datum/reagent/medicine/rezadone) require_all_chems = FALSE diff --git a/code/modules/surgery/advanced/pacification.dm b/code/modules/surgery/advanced/pacification.dm index 21c2dafb7389..c276faa2de7a 100644 --- a/code/modules/surgery/advanced/pacification.dm +++ b/code/modules/surgery/advanced/pacification.dm @@ -20,7 +20,10 @@ /datum/surgery_step/pacify name = "rewire brain" - implements = list(TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15) + implements = list( + TOOL_HEMOSTAT = 100, + TOOL_SCREWDRIVER = 15, //brain surgery with a screwdriver. Ouch! + /obj/item/pen = 5) time = 4 SECONDS preop_sound = 'sound/surgery/hemostat1.ogg' success_sound = 'sound/surgery/hemostat1.ogg' diff --git a/code/modules/surgery/advanced/viral_bonding.dm b/code/modules/surgery/advanced/viral_bonding.dm index 006ebc947ceb..889d894e3d88 100644 --- a/code/modules/surgery/advanced/viral_bonding.dm +++ b/code/modules/surgery/advanced/viral_bonding.dm @@ -20,7 +20,10 @@ /datum/surgery_step/viral_bond name = "viral bond" - implements = list(TOOL_CAUTERY = 100, TOOL_WELDER = 50, /obj/item = 30) // 30% success with any hot item. + implements = list( + TOOL_CAUTERY = 100, + TOOL_WELDER = 40, + /obj/item = 20) // 30% success with any hot item. time = 100 chems_needed = list(/datum/reagent/medicine/spaceacillin,/datum/reagent/consumable/virus_food,/datum/reagent/toxin/formaldehyde) experience_given = MEDICAL_SKILL_ADVANCED diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm index 1ff850c5e39c..91cd1dce07e4 100644 --- a/code/modules/surgery/amputation.dm +++ b/code/modules/surgery/amputation.dm @@ -9,7 +9,14 @@ /datum/surgery_step/sever_limb name = "sever limb" - implements = list(/obj/item/shears = 300, TOOL_SCALPEL = 100, TOOL_SAW = 100, /obj/item/melee/arm_blade = 80, /obj/item/fireaxe = 50, /obj/item/hatchet = 40, /obj/item/kitchen/knife/butcher = 25) + implements = list(//this is fine, detaching limbs doesn't require precision - this is only more precise because zone targeting is randomized + /obj/item/shears = 300, + TOOL_SCALPEL = 100, + TOOL_SAW = 100, + /obj/item/melee/arm_blade = 80, + /obj/item/fireaxe = 50, + /obj/item/hatchet = 40, + /obj/item/kitchen/knife/butcher = 25) time = 6.4 SECONDS preop_sound = 'sound/surgery/scalpel1.ogg' success_sound = 'sound/surgery/organ2.ogg' diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 48dd4caeeb76..92b51e0f2049 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -12,27 +12,43 @@ layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor var/mob/living/carbon/owner = null var/datum/weakref/original_owner = null - ///If you'd like to know if a bodypart is organic, please use is_organic_limb() - var/bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC //List of bodytypes flags, important for fitting clothing. - var/change_exempt_flags //Defines when a bodypart should not be changed. Example: BP_BLOCK_CHANGE_SPECIES prevents the limb from being overwritten on species gain - - var/is_husked = FALSE //Duh - var/limb_id = SPECIES_HUMAN //This is effectively the icon_state for limbs. - var/limb_gender = "m" //Defines what sprite the limb should use if it is also sexually dimorphic. - var/uses_mutcolor = TRUE //Does this limb have a greyscale version? - var/is_dimorphic = FALSE //Is there a sprite difference between male and female? - var/draw_color //Greyscale draw color + ///List of bodytypes flags, important for fitting clothing. If you'd like to know if a bodypart is organic, please use is_organic_limb() + var/bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC + + ///Whether the clothing being worn forces the limb into being "squished" to plantigrade/standard humanoid compliance + var/plantigrade_forced = FALSE + ///Whether the limb is husked + var/is_husked = FALSE + ///This is effectively the icon_state prefix for limbs. + var/limb_id = SPECIES_HUMAN + ///Defines what sprite the limb should use if it is also sexually dimorphic. + var/limb_gender = "m" + ///Does this limb have a greyscale version? + var/uses_mutcolor = TRUE + ///Is there a sprite difference between male and female? + var/is_dimorphic = FALSE + ///Greyscale draw color + var/draw_color + + /// The icon state of the limb's overlay, colored with a different color + var/overlay_icon_state + /// The color of the limb's overlay + var/species_secondary_color var/body_zone //BODY_ZONE_CHEST, BODY_ZONE_L_ARM, etc , used for def_zone /// The body zone of this part in english ("chest", "left arm", etc) without the species attached to it var/plaintext_zone var/aux_zone // used for hands var/aux_layer - var/body_part = null //bitflag used to check which clothes cover this bodypart + ///bitflag used to check which clothes cover this bodypart + var/body_part = null var/list/embedded_objects = list() - var/held_index = 0 //are we a hand? if so, which one! - var/is_pseudopart = FALSE //For limbs that don't really exist, eg chainsaws - var/bone_status = BONE_FLAG_NO_BONES // Is it fine, broken, splinted, or just straight up fucking gone + ///Are we a hand? if so, which one! + var/held_index = 0 + ///For limbs that don't really exist, eg chainsaws + var/is_pseudopart = FALSE + /// Is it fine, broken, splinted, or just straight up fucking gone + var/bone_status = BONE_FLAG_NO_BONES var/bone_break_threshold = 30 /// So we know if we need to scream if this limb hits max damage @@ -43,7 +59,8 @@ var/disable_threshold = 1 ///Controls whether bodypart_disabled makes sense or not for this limb. var/can_be_disabled = FALSE - var/body_damage_coeff = 1 //Multiplier of the limb's damage that gets applied to the mob + ///Multiplier of the limb's damage that gets applied to the mob + var/body_damage_coeff = 1 var/stam_damage_coeff = 0.75 //Why is this the default??? - Kapu var/brutestate = 0 var/burnstate = 0 @@ -53,14 +70,18 @@ var/max_stamina_damage = 0 var/max_damage = 0 - var/cremation_progress = 0 //Gradually increases while burning when at full damage, destroys the limb when at 100 + ///Gradually increases while burning when at full damage, destroys the limb when at 100 + var/cremation_progress = 0 - var/brute_reduction = 0 //Subtracted to brute damage taken - var/burn_reduction = 0 //Subtracted to burn damage taken + ///Subtracted from brute damage taken + var/brute_reduction = 0 + ///Subtracted from burn damage taken + var/burn_reduction = 0 //Coloring and proper item icon update var/skin_tone = "" - var/should_draw_greyscale = TRUE //Limbs need this information as a back-up incase they are generated outside of a carbon (limbgrower) + ///Limbs need this information as a back-up incase they are generated outside of a carbon (limbgrower) + var/should_draw_greyscale = TRUE var/species_color = "" var/mutation_color = "" /// The colour of damage done to this bodypart @@ -69,14 +90,17 @@ var/use_damage_color = FALSE var/no_update = 0 - var/animal_origin = null //for nonhuman bodypart (e.g. monkey) - var/dismemberable = 1 //whether it can be dismembered with a weapon. + /// If it's a nonhuman bodypart (e.g. monkey) + var/animal_origin = null + /// Whether it can be dismembered with a weapon + var/dismemberable = TRUE var/px_x = 0 var/px_y = 0 var/species_flags_list = list() - var/dmg_overlay_type //the type of damage overlay (if any) to use when this bodypart is bruised/burned. + ///the type of damage overlay (if any) to use when this bodypart is bruised/burned. + var/dmg_overlay_type //Damage messages used by help_shake_act() var/light_brute_msg = "bruised" @@ -549,6 +573,9 @@ else species_color = null + if(overlay_icon_state) + species_secondary_color = H.dna.features["mcolor2"] + UnregisterSignal(owner, COMSIG_MOVABLE_MOVED) if(NO_BONES in S.species_traits) bone_status = BONE_FLAG_NO_BONES @@ -632,11 +659,13 @@ limb.icon = icon if(!should_draw_greyscale || !icon) limb.icon = static_icon - if(is_dimorphic) //Does this type of limb have sexual dimorphism? - limb.icon_state = "[limb_id]_[body_zone]_[limb_gender]" - else - limb.icon_state = "[limb_id]_[body_zone]" + limb.icon_state = "[limb_id]_[body_zone]" + + if(is_dimorphic) //Does this type of limb have sexual dimorphism? + limb.icon_state += "_[limb_gender]" + if(bodytype & BODYTYPE_DIGITIGRADE && !plantigrade_forced) + limb.icon_state += "_digitigrade" if(!icon_exists(limb.icon, limb.icon_state)) limb_stacktrace("Limb generated with nonexistant icon. File: [limb.icon] | State: [limb.icon_state]", GLOB.Debug) //If you *really* want more of these, you can set the *other* global debug flag manually. @@ -647,6 +676,10 @@ if(aux_zone) //Hand shit aux = image(limb.icon, "[limb_id]_[aux_zone]", -aux_layer, image_dir) . += aux + if(overlay_icon_state) + var/image/overlay = image(limb.icon, "[limb_id]_[aux_zone]_overlay", -aux_layer, image_dir) + overlay.color = "#[species_secondary_color]" + . += overlay draw_color = mutation_color if(should_draw_greyscale) //Should the limb be colored outside of a forced color? @@ -657,6 +690,11 @@ if(aux_zone) aux.color = "#[draw_color]" + if(overlay_icon_state) + var/image/overlay = image(limb.icon, "[limb.icon_state]_overlay", -BODY_ADJ_LAYER, image_dir) + overlay.color = "#[species_secondary_color]" + . += overlay + //Ok so legs are a bit goofy in regards to layering, and we will need two images instead of one to fix that if((body_zone == BODY_ZONE_R_LEG) || (body_zone == BODY_ZONE_L_LEG)) var/obj/item/bodypart/leg/leg_source = src @@ -680,7 +718,8 @@ external_organ.bitflag_to_layer(external_layer), limb_gender, )*/ - return . + + return /obj/item/bodypart/deconstruct(disassembled = TRUE) drop_organs() diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 46cb0f85728d..e360945a16d3 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -381,21 +381,21 @@ /mob/living/proc/regenerate_limbs(noheal = FALSE, list/excluded_zones = list()) SEND_SIGNAL(src, COMSIG_LIVING_REGENERATE_LIMBS, noheal, excluded_zones) -/mob/living/carbon/regenerate_limbs(noheal = FALSE, list/excluded_zones = list()) +/mob/living/carbon/regenerate_limbs(noheal = FALSE, list/excluded_zones = list(), robotic = FALSE) . = ..() var/list/zone_list = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) if(length(excluded_zones)) zone_list -= excluded_zones for(var/Z in zone_list) - . += regenerate_limb(Z, noheal) + . += regenerate_limb(Z, noheal, robotic) -/mob/living/proc/regenerate_limb(limb_zone, noheal) +/mob/living/proc/regenerate_limb(limb_zone, noheal, robotic = FALSE) return -/mob/living/carbon/regenerate_limb(limb_zone, noheal) +/mob/living/carbon/regenerate_limb(limb_zone, noheal, robotic = FALSE) var/obj/item/bodypart/L if(get_bodypart(limb_zone)) return FALSE - L = newBodyPart(limb_zone, 0, 0) + L = new_body_part(limb_zone, robotic, FALSE) L.replace_limb(src, TRUE, TRUE) return 1 diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index c35070ce07be..73ecf0e52444 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -145,24 +145,32 @@ // // FUCK YOU AUGMENT CODE - With love, Kapu //Hi Kapu -/mob/living/carbon/proc/newBodyPart(zone, robotic, fixed_icon) +// this code was perfectly fine kapu +/mob/living/carbon/proc/new_body_part(zone, robotic, fixed_icon, datum/species/species) + species ||= dna.species var/obj/item/bodypart/L switch(zone) if(BODY_ZONE_L_ARM) - L = new dna.species.species_l_arm() + L = robotic ? new species.species_robotic_l_arm() : new species.species_l_arm() if(BODY_ZONE_R_ARM) - L = new dna.species.species_r_arm() + L = robotic ? new species.species_robotic_r_arm() : new species.species_r_arm() if(BODY_ZONE_HEAD) - L = new dna.species.species_head() + L = robotic ? new species.species_robotic_head() : new species.species_head() if(BODY_ZONE_L_LEG) - L = new dna.species.species_l_leg() + if(species.is_digitigrade(src)) + L = robotic ? new species.species_robotic_digi_l_leg() : new species.species_digi_l_leg() + else + L = robotic ? new species.species_robotic_l_leg() : new species.species_l_leg() if(BODY_ZONE_R_LEG) - L = new dna.species.species_r_leg() + if(species.is_digitigrade(src)) + L = robotic ? new species.species_robotic_digi_r_leg() : new species.species_digi_r_leg() + else + L = robotic ? new species.species_robotic_r_leg() : new species.species_r_leg() if(BODY_ZONE_CHEST) - L = new dna.species.species_chest() + L = robotic ? new species.species_robotic_chest() : new species.species_chest() . = L -/mob/living/carbon/monkey/newBodyPart(zone, robotic, fixed_icon) +/mob/living/carbon/monkey/new_body_part(zone, robotic, fixed_icon, datum/species/species) var/obj/item/bodypart/L switch(zone) if(BODY_ZONE_L_ARM) @@ -183,7 +191,7 @@ L.change_bodypart_status(BODYTYPE_ROBOTIC) . = L -/mob/living/carbon/alien/larva/newBodyPart(zone, robotic, fixed_icon) +/mob/living/carbon/alien/larva/new_body_part(zone, robotic, fixed_icon, datum/species/species) var/obj/item/bodypart/L switch(zone) if(BODY_ZONE_HEAD) @@ -196,7 +204,7 @@ L.change_bodypart_status(BODYTYPE_ROBOTIC) . = L -/mob/living/carbon/alien/humanoid/newBodyPart(zone, robotic, fixed_icon) +/mob/living/carbon/alien/humanoid/new_body_part(zone, robotic, fixed_icon, datum/species/species) var/obj/item/bodypart/L switch(zone) if(BODY_ZONE_L_ARM) diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index ecc911502fc0..79b674438098 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -23,7 +23,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -49,7 +48,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -75,7 +73,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -101,7 +98,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -126,7 +122,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -232,7 +227,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - change_exempt_flags = BP_BLOCK_CHANGE_SPECIES brute_reduction = 5 burn_reduction = 4 @@ -355,6 +349,89 @@ burn_reduction = 0 max_damage = 20 +// Lizard Robotic (Synths) +/obj/item/bodypart/chest/robot/lizard + name = "prosthetic lizard chest" + is_dimorphic = TRUE + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + acceptable_bodytype = BODYTYPE_HUMANOID + +/obj/item/bodypart/head/robot/lizard + name = "prosthetic lizard head" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/l_arm/robot/lizard + name = "prosthetic lizard left arm" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/r_arm/robot/lizard + name = "prosthetic lizard right arm" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/leg/left/robot/lizard + name = "prosthetic lizard left leg" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/leg/left/robot/lizard + name = "prosthetic lizard right leg" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +// Surplus Lizard Robotic +/obj/item/bodypart/l_arm/robot/surplus/lizard + name = "surplus prosthetic lizard left arm" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/r_arm/robot/surplus/lizard + name = "surplus prosthetic lizard right arm" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/leg/left/robot/surplus/lizard + name = "surplus prosthetic lizard left leg" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/leg/right/robot/surplus/lizard + name = "surplus prosthetic lizard right leg" + icon = 'icons/mob/augmentation/augments_lizard.dmi' + should_draw_greyscale = TRUE + overlay_icon_state = TRUE + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC + +/obj/item/bodypart/leg/left/robot/surplus/lizard/digitigrade + name = "surplus prosthetic digitigrade lizard left leg" + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE + +/obj/item/bodypart/leg/right/robot/surplus/lizard/digitigrade + name = "surplus prosthetic digitigrade lizard right leg" + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE + +//Kepori Robotic /obj/item/bodypart/chest/robot/kepori name = "prosthetic kepori chest" static_icon = 'icons/mob/augmentation/augments_kepori.dmi' @@ -386,6 +463,7 @@ static_icon = 'icons/mob/augmentation/augments_kepori.dmi' bodytype = BODYTYPE_KEPORI | BODYTYPE_ROBOTIC +//Surplus Kepori Robotic /obj/item/bodypart/l_arm/robot/surplus/kepori name = "surplus prosthetic kepori left arm" static_icon = 'icons/mob/augmentation/augments_kepori.dmi' @@ -406,6 +484,42 @@ static_icon = 'icons/mob/augmentation/augments_kepori.dmi' bodytype = BODYTYPE_KEPORI | BODYTYPE_ROBOTIC + +// Vox Robotic +/obj/item/bodypart/chest/robot/vox + name = "prosthetic vox chest" + is_dimorphic = TRUE + static_icon = 'icons/mob/augmentation/augments_vox.dmi' + bodytype = BODYTYPE_VOX | BODYTYPE_ROBOTIC + acceptable_bodytype = BODYTYPE_VOX + +/obj/item/bodypart/head/robot/vox + name = "prosthetic vox head" + is_dimorphic = TRUE + static_icon = 'icons/mob/augmentation/augments_vox.dmi' + bodytype = BODYTYPE_VOX | BODYTYPE_ROBOTIC + +/obj/item/bodypart/l_arm/robot/vox + name = "prosthetic vox left arm" + static_icon = 'icons/mob/augmentation/augments_vox.dmi' + bodytype = BODYTYPE_VOX | BODYTYPE_ROBOTIC + +/obj/item/bodypart/r_arm/robot/vox + name = "prosthetic vox right arm" + static_icon = 'icons/mob/augmentation/augments_vox.dmi' + bodytype = BODYTYPE_VOX | BODYTYPE_ROBOTIC + +/obj/item/bodypart/l_leg/robot/vox + name = "prosthetic vox left leg" + static_icon = 'icons/mob/augmentation/augments_vox.dmi' + bodytype = BODYTYPE_VOX | BODYTYPE_ROBOTIC + +/obj/item/bodypart/r_leg/robot/vox + name = "prosthetic vox right leg" + static_icon = 'icons/mob/augmentation/augments_vox.dmi' + bodytype = BODYTYPE_VOX | BODYTYPE_ROBOTIC + +// Surplus Vox Robotic /obj/item/bodypart/l_arm/robot/surplus/vox name = "surplus prosthetic vox left arm" static_icon = 'icons/mob/augmentation/augments_vox.dmi' diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm index 7ca16b5fea5a..e1752f0448d8 100644 --- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm @@ -29,16 +29,12 @@ uses_mutcolor = TRUE limb_id = SPECIES_LIZARD -/obj/item/bodypart/leg/left/digitigrade +/obj/item/bodypart/leg/left/lizard/digitigrade icon = 'icons/mob/species/lizard/bodyparts.dmi' - icon_state = "digitigrade_l_leg" - uses_mutcolor = TRUE - limb_id = "digitigrade" + icon_state = "lizard_l_leg_digitigrade" bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE -/obj/item/bodypart/leg/right/digitigrade +/obj/item/bodypart/leg/right/lizard/digitigrade icon = 'icons/mob/species/lizard/bodyparts.dmi' - icon_state = "digitigrade_r_leg" - uses_mutcolor = TRUE - limb_id = "digitigrade" + icon_state = "lizard_r_leg_digitigrade" bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE diff --git a/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm index 2be9e4686cae..1437e191578f 100644 --- a/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm @@ -13,11 +13,6 @@ acceptable_bodytype = BODYTYPE_VOX should_draw_greyscale = FALSE -/obj/item/bodypart/chest/vox/on_life() - . = ..() - if(owner.stat != DEAD) - owner.adjust_bodytemperature(length(owner.bodyparts) * 2, 0, owner.dna.species.bodytemp_heat_damage_limit + 50) //More meat = more heat - /obj/item/bodypart/l_arm/vox static_icon = 'icons/mob/species/vox/bodyparts.dmi' limb_id = SPECIES_VOX diff --git a/code/modules/surgery/bone_repair.dm b/code/modules/surgery/bone_repair.dm index 8552b8e1a826..9f933d8f49c3 100644 --- a/code/modules/surgery/bone_repair.dm +++ b/code/modules/surgery/bone_repair.dm @@ -15,7 +15,9 @@ /datum/surgery_step/set_bone name = "set bone" time = 6.4 SECONDS - implements = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 25, TOOL_WRENCH = 35) + implements = list( + TOOL_HEMOSTAT = 100, + TOOL_WRENCH = 40) preop_sound = 'sound/surgery/bone1.ogg' success_sound = 'sound/surgery/bone3.ogg' diff --git a/code/modules/surgery/brain_surgery.dm b/code/modules/surgery/brain_surgery.dm index 5a37135b3e01..0b1d8610889f 100644 --- a/code/modules/surgery/brain_surgery.dm +++ b/code/modules/surgery/brain_surgery.dm @@ -14,7 +14,10 @@ /datum/surgery_step/fix_brain name = "fix brain" - implements = list(TOOL_HEMOSTAT = 85, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15) //don't worry, pouring some alcohol on their open brain will get that chance to 100 + implements = list( + TOOL_HEMOSTAT = 85, + TOOL_SCREWDRIVER = 40, + /obj/item/pen = 5) //don't worry, pouring some alcohol on their open brain will get that chance to 100 //will it? i don't know. repeatable = TRUE time = 10 SECONDS //long and complicated preop_sound = 'sound/surgery/hemostat1.ogg' diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index 8a85f40053ca..0ad1e119e9e2 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -9,7 +9,8 @@ /datum/surgery_step/handle_cavity name = "implant item" accept_hand = TRUE - implements = list(/obj/item = 100) + implements = list( + /obj/item = 100) repeatable = TRUE time = 3.2 SECONDS preop_sound = 'sound/surgery/organ1.ogg' diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm index e2117032b3da..c5bfd1108202 100644 --- a/code/modules/surgery/core_removal.dm +++ b/code/modules/surgery/core_removal.dm @@ -14,7 +14,9 @@ //extract brain /datum/surgery_step/extract_core name = "extract core" - implements = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 100) + implements = list( + TOOL_HEMOSTAT = 100, + TOOL_CROWBAR = 100) time = 16 /datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index 82ac1f0fccdc..4c416c31c633 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -17,12 +17,13 @@ return TRUE return FALSE - //an incision but with greater bleed, and a 90% base success chance /datum/surgery_step/incise_heart name = "incise heart" - implements = list(TOOL_SCALPEL = 90, /obj/item/melee/transforming/energy/sword = 45, /obj/item/kitchen/knife = 45, - /obj/item/shard = 25) + implements = list( + TOOL_SCALPEL = 90, + /obj/item/kitchen/knife = 40, + /obj/item/shard = 33) time = 1.6 SECONDS preop_sound = 'sound/surgery/scalpel1.ogg' success_sound = 'sound/surgery/scalpel2.ogg' @@ -41,7 +42,7 @@ "Blood pools around the incision in [H]'s heart.", "") H.bleed_rate += 10 - H.adjustBruteLoss(10) + target.apply_damage(15, BRUTE, "[target_zone]") return ..() /datum/surgery_step/incise_heart/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -52,12 +53,15 @@ "[user] screws up, causing blood to spurt out of [H]'s chest!") H.bleed_rate += 20 H.adjustOrganLoss(ORGAN_SLOT_HEART, 10) - H.adjustBruteLoss(10) + target.apply_damage(15, BRUTE, "[target_zone]") //grafts a coronary bypass onto the individual's heart, success chance is 90% base again /datum/surgery_step/coronary_bypass name = "graft coronary bypass" - implements = list(TOOL_HEMOSTAT = 90, TOOL_WIRECUTTER = 35, /obj/item/stack/packageWrap = 15, /obj/item/stack/cable_coil = 5) + implements = list( + TOOL_HEMOSTAT = 90, + TOOL_WIRECUTTER = 40, + /obj/item/stack/cable_coil = 5) time = 9 SECONDS preop_sound = 'sound/surgery/hemostat1.ogg' success_sound = 'sound/surgery/hemostat1.ogg' @@ -85,6 +89,6 @@ display_results(user, target, "You screw up in attaching the graft, and it tears off, tearing part of the heart!", "[user] screws up, causing blood to spurt out of [H]'s chest profusely!", "[user] screws up, causing blood to spurt out of [H]'s chest profusely!") - H.adjustOrganLoss(ORGAN_SLOT_HEART, 20) + H.adjustOrganLoss(ORGAN_SLOT_HEART, 30) H.bleed_rate += 30 return FALSE diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 1bac32665005..a5645094ed2f 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -5,7 +5,8 @@ /datum/surgery_step/insert_pill name = "insert pill" - implements = list(/obj/item/reagent_containers/pill = 100) + implements = list( + /obj/item/reagent_containers/pill = 100) time = 16 experience_given = (MEDICAL_SKILL_MEDIUM*0.4) //quick to do diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm index 3c9e051ee453..7cf752ddf998 100644 --- a/code/modules/surgery/experimental_dissection.dm +++ b/code/modules/surgery/experimental_dissection.dm @@ -30,7 +30,12 @@ /datum/surgery_step/dissection name = "dissection" - implements = list(/obj/item/scalpel/augment = 75, /obj/item/scalpel/advanced = 60, TOOL_SCALPEL = 45, /obj/item/kitchen/knife = 20, /obj/item/shard = 10)// special tools not only cut down time but also improve probability + implements = list( + /obj/item/scalpel/augment = 75, + /obj/item/scalpel/advanced = 60, + TOOL_SCALPEL = 45, + /obj/item/kitchen/knife = 30, + /obj/item/shard = 10)// special tools not only cut down time but also improve probability time = 125 silicons_obey_prob = TRUE repeatable = TRUE @@ -57,7 +62,7 @@ cost = (BASE_HUMAN_REWARD*24) else if(isgolem(H) || iszombie(H) || isshadow(H) || isandroid(H)) cost = (BASE_HUMAN_REWARD*20) - else if(isjellyperson(H) || ispodperson(H) || issquidperson(H) || isalien(H)) + else if(isjellyperson(H) || ispodperson(H) || isalien(H)) cost = (BASE_HUMAN_REWARD*14) else if(isskeleton(H)) cost = (BASE_HUMAN_REWARD * 0.5) diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm index 40a1df3e2658..d7aa93146203 100644 --- a/code/modules/surgery/eye_surgery.dm +++ b/code/modules/surgery/eye_surgery.dm @@ -8,7 +8,9 @@ //fix eyes /datum/surgery_step/fix_eyes name = "fix eyes" - implements = list(TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 45, /obj/item/pen = 25) + implements = list( + TOOL_HEMOSTAT = 100, + TOOL_SCREWDRIVER = 40) //ow! my eyes ! time = 64 experience_given = (MEDICAL_SKILL_ORGAN_FIX*0.6) //repeatable and can be done at any damage diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm index a6c954568597..f4bd48c4729d 100644 --- a/code/modules/surgery/gastrectomy.dm +++ b/code/modules/surgery/gastrectomy.dm @@ -22,8 +22,11 @@ //95% chance of success to be consistent with most organ-repairing surgeries. /datum/surgery_step/gastrectomy name = "remove lower duodenum" - implements = list(TOOL_SCALPEL = 95, /obj/item/melee/transforming/energy/sword = 65, /obj/item/kitchen/knife = 45, - /obj/item/shard = 35) + implements = list( + TOOL_SCALPEL = 95, + /obj/item/melee/transforming/energy/sword = 33, + /obj/item/kitchen/knife = 40, + /obj/item/shard = 10) time = 52 experience_given = (MEDICAL_SKILL_ORGAN_FIX*0.8) //for consistency across organ surgeries @@ -34,7 +37,7 @@ /datum/surgery_step/gastrectomy/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/mob/living/carbon/human/H = target - H.setOrganLoss(ORGAN_SLOT_STOMACH, 20) // Stomachs have a threshold for being able to even digest food, so I might tweak this number + H.setOrganLoss(ORGAN_SLOT_STOMACH, 10) // Stomachs have a threshold for being able to even digest food, so I might tweak this number display_results(user, target, "You successfully remove the damaged part of [target]'s stomach.", "[user] successfully removes the damaged part of [target]'s stomach.", "[user] successfully removes the damaged part of [target]'s stomach.") @@ -42,7 +45,7 @@ /datum/surgery_step/gastrectomy/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery) var/mob/living/carbon/human/H = target - H.adjustOrganLoss(ORGAN_SLOT_STOMACH, 15) + H.adjustOrganLoss(ORGAN_SLOT_STOMACH, 20) display_results(user, target, "You cut the wrong part of [target]'s stomach!", "[user] cuts the wrong part of [target]'s stomach!", "[user] cuts the wrong part of [target]'s stomach!") diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index 26da9bb46fec..956768c09aa4 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -25,7 +25,9 @@ /datum/surgery_step/heal name = "repair body" - implements = list(TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 65, /obj/item/pen = 55) + implements = list( + TOOL_HEMOSTAT = 100, + TOOL_SCREWDRIVER = 40)//something else could be added here - but I would prefer not. Hemostat is not that hard to come by and SHOULD be standard for ship equipment. repeatable = TRUE time = 2.5 SECONDS success_sound = 'sound/surgery/retractor2.ogg' @@ -172,9 +174,6 @@ missinghpbonus = 5 /***************************COMBO***************************/ -/datum/surgery/healing/combo - - /datum/surgery/healing/combo name = "Tend Wounds (Mixture, Basic)" replaced_by = /datum/surgery/healing/combo/upgraded @@ -188,7 +187,6 @@ healing_step_type = /datum/surgery_step/heal/combo/upgraded desc = "A surgical procedure that provides advanced treatment for a patient's burns and brute traumas. Heals more when the patient is severely injured." - /datum/surgery/healing/combo/upgraded/femto //no real reason to type it like this except consistency, don't worry you're not missing anything name = "Tend Wounds (Mixture, Exp.)" replaced_by = null diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm index c55db698c67d..e612b6fa18c5 100644 --- a/code/modules/surgery/hepatectomy.dm +++ b/code/modules/surgery/hepatectomy.dm @@ -21,8 +21,11 @@ //95% chance of success, not 100 because organs are delicate /datum/surgery_step/hepatectomy name = "remove damaged liver section" - implements = list(TOOL_SCALPEL = 95, /obj/item/melee/transforming/energy/sword = 65, /obj/item/kitchen/knife = 45, - /obj/item/shard = 35) + implements = list( + TOOL_SCALPEL = 95, + /obj/item/melee/transforming/energy/sword = 33, + /obj/item/kitchen/knife = 40, + /obj/item/shard = 25) time = 52 experience_given = (MEDICAL_SKILL_ORGAN_FIX*0.8) //repeatable so not as much xp @@ -41,7 +44,7 @@ /datum/surgery_step/hepatectomy/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery) var/mob/living/carbon/human/H = target - H.adjustOrganLoss(ORGAN_SLOT_LIVER, 15) + H.adjustOrganLoss(ORGAN_SLOT_LIVER, 20) display_results(user, target, "You cut the wrong part of [target]'s liver!", "[user] cuts the wrong part of [target]'s liver!", "[user] cuts the wrong part of [target]'s liver!") diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index fc3ce760ff98..4866e8aa1541 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -8,7 +8,10 @@ //extract implant /datum/surgery_step/extract_implant name = "extract implant" - implements = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 65, /obj/item/kitchen/fork = 35) + implements = list( + TOOL_HEMOSTAT = 100, + TOOL_CROWBAR = 40, + /obj/item/kitchen/fork = 33) time = 6.4 SECONDS success_sound = 'sound/surgery/hemostat1.ogg' experience_given = MEDICAL_SKILL_MEDIUM diff --git a/code/modules/surgery/ipc_revive.dm b/code/modules/surgery/ipc_revive.dm index 124578c6879d..1077a147b4f1 100644 --- a/code/modules/surgery/ipc_revive.dm +++ b/code/modules/surgery/ipc_revive.dm @@ -19,9 +19,13 @@ return FALSE return isipc(target) -/datum/surgery_step/revive/ipc +/datum/surgery_step/revive/ipc //TODO: make ipcs not auto revive, to make this surgery actually do something. name = "reboot electronics" - implements = list(/obj/item/inducer = 100, /obj/item/shockpaddles = 80, /obj/item/melee/baton = 50, /obj/item/gun/energy = 30) + implements = list( + /obj/item/inducer = 100, + /obj/item/shockpaddles = 80, + /obj/item/melee/baton = 50, + /obj/item/gun/energy = 30) time = 60 /datum/surgery_step/revive/ipc/tool_check(mob/user, obj/item/tool) diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index f36eabc079a7..3348769bc172 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -6,10 +6,12 @@ /datum/surgery_step/replace_limb name = "replace limb" - implements = list(/obj/item/bodypart = 100, /obj/item/organ_storage = 100) + implements = list( + /obj/item/bodypart = 100, + /obj/item/organ_storage = 100) time = 32 experience_given = MEDICAL_SKILL_MEDIUM - var/obj/item/bodypart/L = null // L because "limb" + var/obj/item/bodypart/L = null // L because "limb" //i hate you /datum/surgery_step/replace_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -30,7 +32,6 @@ else user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") - //ACTUAL SURGERIES /datum/surgery/augmentation diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm index 0b509126dbae..be7d824e0b1f 100644 --- a/code/modules/surgery/lipoplasty.dm +++ b/code/modules/surgery/lipoplasty.dm @@ -12,7 +12,10 @@ //cut fat /datum/surgery_step/cut_fat name = "cut excess fat" - implements = list(TOOL_SAW = 100, /obj/item/hatchet = 35, /obj/item/kitchen/knife/butcher = 25) + implements = list( + TOOL_SAW = 100, + /obj/item/hatchet = 40, + /obj/item/kitchen/knife/butcher = 33) time = 64 /datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -30,7 +33,9 @@ //remove fat /datum/surgery_step/remove_fat name = "remove loose fat" - implements = list(TOOL_RETRACTOR = 100, TOOL_SCREWDRIVER = 45, TOOL_WIRECUTTER = 35) + implements = list( + TOOL_RETRACTOR = 100, + TOOL_WIRECUTTER = 40) time = 32 experience_given = 0 //scales with fat removed diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm index 03dd129406f7..09ef68f03e18 100644 --- a/code/modules/surgery/lobectomy.dm +++ b/code/modules/surgery/lobectomy.dm @@ -20,8 +20,11 @@ //lobectomy, removes the most damaged lung lobe with a 95% base success chance /datum/surgery_step/lobectomy name = "excise damaged lung node" - implements = list(TOOL_SCALPEL = 95, /obj/item/melee/transforming/energy/sword = 65, /obj/item/kitchen/knife = 45, - /obj/item/shard = 35) + implements = list( + TOOL_SCALPEL = 95, + /obj/item/melee/transforming/energy/sword = 33, + /obj/item/kitchen/knife = 40, + /obj/item/shard = 25) time = 4.2 SECONDS preop_sound = 'sound/surgery/scalpel1.ogg' success_sound = 'sound/surgery/organ1.ogg' @@ -38,7 +41,7 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/lungs/L = H.getorganslot(ORGAN_SLOT_LUNGS) L.operated = TRUE - H.setOrganLoss(ORGAN_SLOT_LUNGS, 60) + H.setOrganLoss(ORGAN_SLOT_LUNGS, 25) display_results(user, target, "You successfully excise [H]'s most damaged lobe.", "Successfully removes a piece of [H]'s lungs.", "") @@ -50,6 +53,6 @@ display_results(user, target, "You screw up, failing to excise [H]'s damaged lobe!", "[user] screws up!", "[user] screws up!") - H.losebreath += 4 - H.adjustOrganLoss(ORGAN_SLOT_LUNGS, 10) + H.losebreath += 10 + H.adjustOrganLoss(ORGAN_SLOT_LUNGS, 20) return FALSE diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm index 2656dfe405ba..f1fd128c2d9e 100644 --- a/code/modules/surgery/mechanic_steps.dm +++ b/code/modules/surgery/mechanic_steps.dm @@ -5,7 +5,7 @@ TOOL_SCREWDRIVER = 100, TOOL_SCALPEL = 75, // med borgs could try to unscrew shell with scalpel /obj/item/kitchen/knife = 50, - /obj/item = 10) // 10% success with any sharp item. + /obj/item = 10) time = 2.4 SECONDS preop_sound = 'sound/items/screwdriver.ogg' success_sound = 'sound/items/screwdriver2.ogg' @@ -16,11 +16,11 @@ "[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)].") /datum/surgery_step/mechanic_open/tool_check(mob/user, obj/item/tool) - if(istype(tool)) - preop_sound = tool.usesound - else if(!tool.get_sharpness()) //if its not a tool, then we check if its sharp + if(implement_type == /obj/item && !tool.get_sharpness()) return FALSE - . = ..() + if(tool.usesound) + preop_sound = tool.usesound + return ..() //close shell /datum/surgery_step/mechanic_close @@ -29,7 +29,7 @@ TOOL_SCREWDRIVER = 100, TOOL_SCALPEL = 75, /obj/item/kitchen/knife = 50, - /obj/item = 10) // 10% success with any sharp item. + /obj/item = 10) time = 2.4 SECONDS preop_sound = 'sound/items/screwdriver.ogg' success_sound = 'sound/items/screwdriver2.ogg' @@ -40,11 +40,11 @@ "[user] begins to screw the shell of [target]'s [parse_zone(target_zone)].") /datum/surgery_step/mechanic_close/tool_check(mob/user, obj/item/tool) - if(istype(tool)) - preop_sound = tool.usesound - else if(!tool.get_sharpness()) //if its not a tool, then we check if its sharp + if(implement_type == /obj/item && !tool.get_sharpness()) return FALSE - . = ..() + if(tool.usesound) + preop_sound = tool.usesound + return ..() //prepare electronics /datum/surgery_step/prepare_electronics diff --git a/code/modules/surgery/mechanical.dm b/code/modules/surgery/mechanical.dm index b439ea567397..fe7b583d2c36 100644 --- a/code/modules/surgery/mechanical.dm +++ b/code/modules/surgery/mechanical.dm @@ -27,7 +27,13 @@ /datum/surgery_step/heal/mechanic name = "repair components" - implements = list(TOOL_WELDER = 100, TOOL_CAUTERY = 60, /obj/item/melee/transforming/energy = 40, /obj/item/gun/energy/laser = 20, TOOL_WIRECUTTER = 100, TOOL_HEMOSTAT = 60, TOOL_RETRACTOR = 60) + implements = list(TOOL_WELDER = 100, + TOOL_WIRECUTTER = 100, + TOOL_CAUTERY = 60, + TOOL_HEMOSTAT = 60, + TOOL_RETRACTOR = 60, + /obj/item/melee/transforming/energy = 40, + /obj/item/gun/energy/laser = 20) time = 2 SECONDS missinghpbonus = 10 diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 47b180997789..2242c4c242ea 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -68,7 +68,9 @@ time = 6.4 SECONDS name = "manipulate organs" repeatable = TRUE - implements = list(/obj/item/organ = 100, /obj/item/organ_storage = 100, /obj/item/mmi = 100) + implements = list(/obj/item/organ = 100, + /obj/item/organ_storage = 100, + /obj/item/mmi = 100) preop_sound = 'sound/surgery/organ2.ogg' success_sound = 'sound/surgery/organ1.ogg' var/implements_extract = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 55, /obj/item/kitchen/fork = 35) @@ -108,8 +110,6 @@ "[user] begins to insert [tool] into [target]'s [parse_zone(target_zone)].", "[user] begins to insert something into [target]'s [parse_zone(target_zone)].") - //WS Begin - IPCs - if(istype(tool, /obj/item/mmi))//this whole thing is only used for robotic surgery in organ_mani_robotic.dm :* current_type = "posibrain" preop_sound = 'sound/items/tape_flip.ogg' diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 686f75fdfef6..5167bb3a4517 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -2,8 +2,12 @@ //make incision /datum/surgery_step/incise name = "make incision" - implements = list(TOOL_SCALPEL = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65, - /obj/item/shard = 45, /obj/item = 30) // 30% success with any sharp item. + implements = list( + TOOL_SCALPEL = 100, + /obj/item/melee/transforming/energy/sword = 40, + /obj/item/kitchen/knife = 40, + /obj/item/shard = 25, + /obj/item = 15) //any sharp item time = 1.6 SECONDS preop_sound = 'sound/surgery/scalpel1.ogg' success_sound = 'sound/surgery/scalpel2.ogg' @@ -29,6 +33,14 @@ H.bleed_rate += 3 return ..() +/datum/surgery_step/incise/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + display_results(user, target, "You screw up, cutting too deeply!", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]") + target.apply_damage(15, BRUTE, "[target_zone]") + /datum/surgery_step/incise/nobleed //silly friendly! experience_given = 1 //safer so not as much XP @@ -44,7 +56,11 @@ //clamp bleeders /datum/surgery_step/clamp_bleeders name = "clamp bleeders" - implements = list(TOOL_HEMOSTAT = 100, TOOL_WIRECUTTER = 60, /obj/item/stack/packageWrap = 35, /obj/item/stack/cable_coil = 15) + implements = list( + TOOL_HEMOSTAT = 100, + TOOL_WIRECUTTER = 40, + /obj/item/stack/packageWrap = 20, //that would seriously hurt + /obj/item/stack/cable_coil = 20) time = 2.4 SECONDS preop_sound = 'sound/surgery/hemostat1.ogg' @@ -61,10 +77,21 @@ H.bleed_rate = max((H.bleed_rate - 3), 0) return ..() +/datum/surgery_step/clamp_bleeders/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + display_results(user, target, "You screw up, letting go of a vein!", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]") + target.apply_damage(15, BRUTE, "[target_zone]") + //retract skin /datum/surgery_step/retract_skin name = "retract skin" - implements = list(TOOL_RETRACTOR = 100, TOOL_SCREWDRIVER = 45, TOOL_WIRECUTTER = 35, /obj/item/stack/rods = 35) + implements = list( + TOOL_RETRACTOR = 100, + TOOL_SCREWDRIVER = 40, + /obj/item/stack/rods = 10) time = 2.4 SECONDS preop_sound = 'sound/surgery/retractor1.ogg' success_sound = 'sound/surgery/retractor2.ogg' @@ -74,13 +101,22 @@ "[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].", "[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].") - +/datum/surgery_step/retract_skin/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + display_results(user, target, "You screw up, losing grip on the tissue!", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]") + target.apply_damage(10, BRUTE, "[target_zone]") //close incision /datum/surgery_step/close name = "mend incision" - implements = list(TOOL_CAUTERY = 100, /obj/item/gun/energy/laser = 90, TOOL_WELDER = 70, - /obj/item = 30) // 30% success with any hot item. + implements = list( + TOOL_CAUTERY = 100, + TOOL_WELDER = 40, + /obj/item/gun/energy/laser = 60, + /obj/item = 30) // 30% success with any hot item. //this is fine, and decently reasonable time = 2.4 SECONDS preop_sound = 'sound/surgery/cautery1.ogg' success_sound = 'sound/surgery/cautery2.ogg' @@ -98,19 +134,22 @@ /datum/surgery_step/close/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results) if(locate(/datum/surgery_step/saw) in surgery.steps) - target.heal_bodypart_damage(45,0) + target.heal_bodypart_damage(15,0) if (ishuman(target)) var/mob/living/carbon/human/H = target H.bleed_rate = max((H.bleed_rate - 3), 0) return ..() - - //saw bone /datum/surgery_step/saw name = "saw bone" - implements = list(TOOL_SAW = 100,/obj/item/melee/arm_blade = 75, - /obj/item/fireaxe = 50, /obj/item/hatchet = 35, /obj/item/kitchen/knife/butcher = 25, /obj/item = 20) //20% success (sort of) with any sharp item with a force>=10 + implements = list( + TOOL_SAW = 100, + /obj/item/fireaxe = 50, + /obj/item/melee/arm_blade = 40, + /obj/item/hatchet = 40, + /obj/item/kitchen/knife/butcher = 33, + /obj/item = 10) //10% success (sort of) with any sharp item with a force>=10 time = 5.4 SECONDS preop_sound = list( /obj/item/circular_saw = 'sound/surgery/saw.ogg', @@ -133,16 +172,30 @@ return TRUE /datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results) - target.apply_damage(50, BRUTE, "[target_zone]") + target.apply_damage(20, BRUTE, "[target_zone]") display_results(user, target, "You saw [target]'s [parse_zone(target_zone)] open.", "[user] saws [target]'s [parse_zone(target_zone)] open!", "[user] saws [target]'s [parse_zone(target_zone)] open!") return ..() +/datum/surgery_step/saw/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + var/obj/item/bodypart/affected = target.get_bodypart(check_zone(target_zone)) + display_results(user, target, "You screw up, breaking the bone!", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]", + "[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]") + affected.break_bone() + target.apply_damage(25, BRUTE, "[target_zone]") + //drill bone /datum/surgery_step/drill name = "drill bone" - implements = list(TOOL_DRILL = 100, /obj/item/screwdriver/power = 80, /obj/item/pickaxe/drill = 60, TOOL_SCREWDRIVER = 25, /obj/item/kitchen/spoon = 20) + implements = list( + TOOL_DRILL = 100, + /obj/item/screwdriver/power = 45, + TOOL_SCREWDRIVER = 33, + /obj/item/kitchen/spoon = 4.13) //i made this as awful as possible. time = 30 /datum/surgery_step/drill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 56dc170d7700..0bd9ed46d1a9 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -140,11 +140,14 @@ /obj/item/organ/eyes/robotic name = "robotic eyes" - icon_state = "cybernetic_eyeballs" + icon_state = "robotic_eyes" desc = "A very basic set of optical sensors with no extra vision modes or functions." status = ORGAN_ROBOTIC organ_flags = ORGAN_SYNTHETIC +/obj/item/organ/eyes/robotic/lizard + eye_icon_state = "eyes_synth" + /obj/item/organ/eyes/robotic/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -157,6 +160,7 @@ /obj/item/organ/eyes/robotic/xray name = "\improper X-ray eyes" desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile." + icon_state = "robotic_eyes_u2" eye_color = "000" see_in_dark = 8 sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS @@ -164,6 +168,7 @@ /obj/item/organ/eyes/robotic/thermals name = "thermal eyes" desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included." + icon_state = "robotic_eyes_u" eye_color = "FC0" sight_flags = SEE_MOBS lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 2c7a1a508605..26d16ae23e10 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -6,7 +6,7 @@ slot = ORGAN_SLOT_HEART healing_factor = STANDARD_ORGAN_HEALING - decay_factor = 3.5 * STANDARD_ORGAN_DECAY //designed to fail a little under 4 minutes after death + decay_factor = STANDARD_VITAL_ORGAN_DECAY low_threshold_passed = "Prickles of pain appear then die out from within your chest..." high_threshold_passed = "Something inside your chest hurts, and the pain isn't subsiding. You notice yourself breathing far faster than before." diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 243d5b6134c0..d8e10731da30 100644 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -11,7 +11,7 @@ maxHealth = STANDARD_ORGAN_THRESHOLD healing_factor = STANDARD_ORGAN_HEALING - decay_factor = STANDARD_ORGAN_DECAY + decay_factor = STANDARD_VITAL_ORGAN_DECAY food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/iron = 5) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 637b48283c18..264574c476e4 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -28,15 +28,12 @@ var/useable = TRUE var/list/food_reagents = list(/datum/reagent/consumable/nutriment = 5) - - //WS Begin - IPCS var/vital = 0 //Was this organ implanted/inserted/etc, if true will not be removed during species change. var/external = FALSE //whether to call Remove() when qdeling the organ. var/remove_on_qdel = TRUE var/synthetic = FALSE // To distinguish between organic and synthetic organs - //WS End /obj/item/organ/Initialize() . = ..() @@ -192,31 +189,28 @@ return 0 /mob/living/carbon/regenerate_organs() - if(dna?.species) - dna.species.regenerate_organs(src) - return - - else - if(!getorganslot(ORGAN_SLOT_LUNGS)) - var/obj/item/organ/lungs/L = new() - L.Insert(src) + if(!getorganslot(ORGAN_SLOT_LUNGS)) + var/obj/item/organ/lungs/L = new() + L.Insert(src) - if(!getorganslot(ORGAN_SLOT_HEART)) - var/obj/item/organ/heart/H = new() - H.Insert(src) + if(!getorganslot(ORGAN_SLOT_HEART)) + var/obj/item/organ/heart/H = new() + H.Insert(src) - if(!getorganslot(ORGAN_SLOT_TONGUE)) - var/obj/item/organ/tongue/T = new() - T.Insert(src) + if(!getorganslot(ORGAN_SLOT_TONGUE)) + var/obj/item/organ/tongue/T = new() + T.Insert(src) - if(!getorganslot(ORGAN_SLOT_EYES)) - var/obj/item/organ/eyes/E = new() - E.Insert(src) + if(!getorganslot(ORGAN_SLOT_EYES)) + var/obj/item/organ/eyes/E = new() + E.Insert(src) - if(!getorganslot(ORGAN_SLOT_EARS)) - var/obj/item/organ/ears/ears = new() - ears.Insert(src) + if(!getorganslot(ORGAN_SLOT_EARS)) + var/obj/item/organ/ears/ears = new() + ears.Insert(src) +/mob/living/carbon/human/regenerate_organs() + dna.species.regenerate_organs(src, robotic = fbp) /** get_availability * returns whether the species should innately have this organ. diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index 1f5544b8c2de..f587a26d8404 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -43,6 +43,7 @@ /obj/item/organ/tail/lizard name = "\improper Sarathi tail" desc = "A severed Sarathi's tail. Can't they regrow these...?" + icon_state = "severedlizard" color = "#116611" tail_type = "Smooth" var/spines = "None" @@ -112,6 +113,7 @@ /obj/item/organ/tail/fox name = "fox tail" desc = "A severed fox tail. Sad." + icon_state = "severedfox" tail_type = "Fox" /obj/item/organ/tail/fox/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 4d502eac9f90..77fae8c0bb87 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -309,25 +309,6 @@ new_message += message[i] speech_args[SPEECH_MESSAGE] = new_message -/obj/item/organ/tongue/squid - name = "squid tongue" - desc = "A smaller tentacle used to synthesize speech." - icon_state = "tonguesquid" - var/static/list/languages_possible_squid = typecacheof(list( - /datum/language/rylethian, - /datum/language/common, - /datum/language/xenocommon, - /datum/language/aphasia, - /datum/language/narsie, - /datum/language/monkey, - /datum/language/shadowtongue, - /datum/language/ratvar - )) - -/obj/item/organ/tongue/squid/Initialize(mapload) - . = ..() - languages_possible = languages_possible_squid - /obj/item/organ/tongue/ethereal name = "electric discharger" desc = "A sophisticated ethereal organ, capable of synthesising speech via electrical discharge." diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm index 0e1ddd396153..9c87a5b5a93f 100644 --- a/code/modules/surgery/plastic_surgery.dm +++ b/code/modules/surgery/plastic_surgery.dm @@ -6,7 +6,10 @@ //reshape_face /datum/surgery_step/reshape_face name = "reshape face" - implements = list(TOOL_SCALPEL = 100, /obj/item/kitchen/knife = 50, TOOL_WIRECUTTER = 35) + implements = list( + TOOL_SCALPEL = 100, + /obj/item/kitchen/knife = 40, + TOOL_WIRECUTTER = 33) time = 64 experience_given = MEDICAL_SKILL_MEDIUM diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm index 1e41fad619ee..8b3d4aa1218e 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/prosthetic_replacement.dm @@ -13,11 +13,13 @@ if(!C.get_bodypart(user.zone_selected)) //can only start if limb is missing return 1 - - /datum/surgery_step/add_prosthetic name = "add prosthetic" - implements = list(/obj/item/bodypart = 100, /obj/item/organ_storage = 100, /obj/item/chainsaw = 100, /obj/item/melee/synthetic_arm_blade = 100) + implements = list( + /obj/item/bodypart = 100, + /obj/item/organ_storage = 100, + /obj/item/chainsaw = 100, + /obj/item/melee/synthetic_arm_blade = 100) time = 32 experience_given = MEDICAL_SKILL_ORGAN_FIX //won't get full XP if rejected var/organ_rejection_dam = 0 @@ -86,7 +88,7 @@ "[user] successfully replaces [target]'s [parse_zone(target_zone)]!") return else - var/obj/item/bodypart/L = target.newBodyPart(target_zone, FALSE, FALSE) + var/obj/item/bodypart/L = target.new_body_part(target_zone, FALSE, FALSE) L.is_pseudopart = TRUE if(!L.attach_limb(target)) display_results(user, target, "You fail in attaching [target]'s [parse_zone(target_zone)]! Their body has rejected [L]!", diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index c4e923b4b996..ac23b468044e 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -3,7 +3,6 @@ steps = list(/datum/surgery_step/incise, /datum/surgery_step/remove_object) possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD) - /datum/surgery_step/remove_object name = "remove embedded objects" time = 32 @@ -11,7 +10,6 @@ experience_given = MEDICAL_SKILL_MEDIUM var/obj/item/bodypart/L = null - /datum/surgery_step/remove_object/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) L = surgery.operated_bodypart if(L) @@ -22,7 +20,6 @@ else user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") - /datum/surgery_step/remove_object/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) if(L) if(ishuman(target)) diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm index 400adab16daf..86b3e389e0b5 100644 --- a/code/modules/surgery/revival.dm +++ b/code/modules/surgery/revival.dm @@ -27,12 +27,15 @@ /datum/surgery_step/revive name = "shock brain" - implements = list(/obj/item/shockpaddles = 100, /obj/item/melee/baton = 75, /obj/item/gun/energy = 60) - time = 12 SECONDS + implements = list( + /obj/item/shockpaddles = 100, //this is useful for reviving simepeople. + /obj/item/melee/baton = 40, //i hate this a lot + /obj/item/gun/energy = 30, //should be tasers only + /obj/item/inducer = 30) //why not + time = 3 SECONDS success_sound = 'sound/magic/lightningbolt.ogg' failure_sound = 'sound/machines/defib_zap.ogg' repeatable = TRUE - time = 120 experience_given = MEDICAL_SKILL_ADVANCED /datum/surgery_step/revive/tool_check(mob/user, obj/item/tool) @@ -87,5 +90,5 @@ "[user] send a powerful shock to [target]'s brain with [tool], but [target.p_they()] doesn't react.", "[user] send a powerful shock to [target]'s brain with [tool], but [target.p_they()] doesn't react.") playsound(get_turf(target), 'sound/magic/lightningbolt.ogg', 50, TRUE) - target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 180) + target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20, 180) return FALSE diff --git a/code/modules/surgery/stomachpump.dm b/code/modules/surgery/stomachpump.dm index 63bdfedff9d4..c6cddae3a689 100644 --- a/code/modules/surgery/stomachpump.dm +++ b/code/modules/surgery/stomachpump.dm @@ -58,4 +58,4 @@ "[user] screws up, brusing [H]'s chest!", "[user] screws up!") H.adjustOrganLoss(ORGAN_SLOT_STOMACH, 5) - H.adjustBruteLoss(5) + target.apply_damage(15, BRUTE, "[target_zone]") diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index ca94ad3e77b7..4f98fe339c87 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -37,7 +37,6 @@ operated_bodypart = null return ..() - /datum/surgery/proc/can_start(mob/user, mob/living/patient) //FALSE to not show in list . = TRUE if(replaced_by == /datum/surgery) @@ -162,7 +161,6 @@ // var/list/bodyparts (/mob/living/carbon/human) is the LIMBS of a Mob. //Surgical procedures are initiated by attempt_initiate_surgery(), which is called by sharp objects, such as scalpels. - //TODO //specific steps for some surgeries (fluff text) //more interesting failure options @@ -171,7 +169,6 @@ //add a probability modifier for the state of the surgeon- health, twitching, etc. blindness, god forbid. //helper for converting a zone_sel.selecting to body part (for damage) - //RESOLVED ISSUES //"Todo" jobs that have been completed //combine hands/feet into the arms - Hands/feet were removed - RR //surgeries (not steps) that can be initiated on any body part (corresponding with damage locations) - Call this one done, see possible_locs var - c0 diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm index 46a4317fea40..88b0933ecbeb 100644 --- a/code/modules/tgui/external.dm +++ b/code/modules/tgui/external.dm @@ -42,7 +42,7 @@ * * required user mob The mob interacting with the UI. * - * return list Statuic Data to be sent to the UI. + * return list Static Data to be sent to the UI. */ /datum/proc/ui_static_data(mob/user) return list() diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 517a3b0e40bd..f44687b85ad6 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -21,6 +21,7 @@ #define TEST_FOCUS(test_path) ##test_path { focus = TRUE; } #include "anchored_mobs.dm" +#include "autowiki.dm" #include "bespoke_id.dm" #include "binary_insert.dm" #include "combat.dm" diff --git a/code/modules/unit_tests/autowiki.dm b/code/modules/unit_tests/autowiki.dm new file mode 100644 index 000000000000..65ec2e228dd2 --- /dev/null +++ b/code/modules/unit_tests/autowiki.dm @@ -0,0 +1,35 @@ +/// Tests that all autowikis generate something without runtiming +/datum/unit_test/autowiki + +/datum/unit_test/autowiki/Run() + TEST_ASSERT(istext(generate_autowiki_output()), "generate_autowiki_output() did not finish successfully!") + +/// Test that `include_template` produces reasonable results +/datum/unit_test/autowiki_include_template + +/datum/unit_test/autowiki_include_template/Run() + var/datum/autowiki/autowiki_api = new + + TEST_ASSERT_EQUAL( \ + autowiki_api.include_template("Template"), \ + "{{Template}}", \ + "Basic template did not format correctly" \ + ) + + TEST_ASSERT_EQUAL( \ + autowiki_api.include_template("Template", list("name" = "Mothblocks")), \ + "{{Template|name=Mothblocks}}", \ + "Template with basic arguments did not format correctly" \ + ) + + TEST_ASSERT_EQUAL( \ + autowiki_api.include_template("Template", list("name" = autowiki_api.escape_value("P|peline"))), \ + "{{Template|name=P{{!}}peline}}", \ + "Template with escaped arguments did not format correctly" \ + ) + + TEST_ASSERT_EQUAL( \ + autowiki_api.include_template("Template", list("food" = list("fruit", "candy"))), \ + "{{Template|food1=fruit|food2=candy}}", \ + "Template with array arguments did not format correctly" \ + ) diff --git a/code/modules/unit_tests/plantgrowth_tests.dm b/code/modules/unit_tests/plantgrowth_tests.dm index 6b40236860ef..15c56a12ec1d 100644 --- a/code/modules/unit_tests/plantgrowth_tests.dm +++ b/code/modules/unit_tests/plantgrowth_tests.dm @@ -8,7 +8,6 @@ states |= icon_states('icons/obj/hydroponics/growing_flowers.dmi') states |= icon_states('icons/obj/hydroponics/growing_mushrooms.dmi') states |= icon_states('icons/obj/hydroponics/growing_vegetables.dmi') - states |= icon_states('goon/icons/obj/hydroponics.dmi') var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - typesof(/obj/item/seeds/sample) - /obj/item/seeds/lavaland for(var/seedpath in paths) diff --git a/config/config.txt b/config/config.txt index 8e536bb8ccd2..89dd495066eb 100644 --- a/config/config.txt +++ b/config/config.txt @@ -69,19 +69,20 @@ ENABLE_LOCALHOST_RANK #USE_ACCOUNT_AGE_FOR_JOBS ## Unhash this to track player playtime in the database. Requires database to be enabled. +## Playtime requirements for ship spawning and job selection is ignored unless this is enabled. #USE_EXP_TRACKING -## Unhash this to enable playtime requirements for head jobs. -#USE_EXP_RESTRICTIONS_HEADS -## Unhash this to override head jobs' playtime requirements with this number of hours. -## Leave this commented out to use the values defined in the job datums. Values in the datums are stored as minutes. -#USE_EXP_RESTRICTIONS_HEADS_HOURS 3 -## Unhash this to change head jobs' playtime requirements so that they're based on department playtime, rather than crew playtime. -#USE_EXP_RESTRICTIONS_HEADS_DEPARTMENT -## Unhash this to enable playtime requirements for certain non-head jobs, like Engineer and Scientist. -#USE_EXP_RESTRICTIONS_OTHER -## Allows admins to bypass job playtime requirements. +## Allows admins to bypass job and ship playtime requirements. #USE_EXP_RESTRICTIONS_ADMIN_BYPASS +## The "base" minimum number of minutes as living to spawn a ship from the join menu. +## Ships may have differing true values depending on the template's coefficient, defined in JSON. +## The ship spawn playtime restriction is the ONLY restriction that applies for ship spawning. +SHIP_SPAWN_BASE_EXP_MIN 600 +## The "base" minimum number of minutes as living to spawn into an officer job. +## Ships may have differing true values depending on the template's coefficient, defined in JSON. +## Once the ship has been spawned, this restriction will apply for any officer job being joined on a ship. +OFFICER_JOIN_BASE_EXP_MIN 300 + ## log OOC channel LOG_OOC @@ -308,9 +309,9 @@ CHECK_RANDOMIZER ## Uncomment this to forbid admins from possessing the singularity. #FORBID_SINGULO_POSSESSION -## Uncomment to show a popup 'reply to' window to every non-admin that receives an adminPM. -## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off) -#POPUP_ADMIN_PM +## Uncomment to give admins the ability to send a maptext popup to players. +## Only fires when an admin requests it, not every ahelp. +POPUP_ADMIN_PM ## Uncomment to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR ALLOW_HOLIDAYS @@ -570,8 +571,12 @@ AUTO_PROFILE ## THIS CONFIG DOES NOT OVERRIDE THE NORESPAWN FLAG RESPAWN_TIMER 600 -## Custom shuttle spam prevention. Changine these numbers allows you to change the maxsize and amount of custom shuttles. +## If the number of controlled non-subshuttle ships in existence is greater than this number, +## the shuttle creator and roundstart menu will stop new ships from being created. +## If this is undesired, just set this to an arbitrarily high value. MAX_SHUTTLE_COUNT 20 + +## Limits the maximum size in tiles of a custom shuttle. MAX_SHUTTLE_SIZE 300 ### ALL SETTINGS FOR SSmetrics ### diff --git a/goon/LICENSE.md b/goon/LICENSE.md deleted file mode 100644 index 5bda1d84f9b7..000000000000 --- a/goon/LICENSE.md +++ /dev/null @@ -1,4 +0,0 @@ -This work is licensed under the Creative Commons -Attribution-NonCommercial-ShareAlike 3.0 United States License. To view a copy -of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/us/ or -send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. diff --git a/goon/README.md b/goon/README.md deleted file mode 100644 index cae34de90841..000000000000 --- a/goon/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Goon-ported-assets - -All files excluding this one you're reading right now have been most likely, taken from [goonstation's 2016 release](https://github.com/goonstation/goonstation-2016), unless stated otherwise. -It is very likely that there are modifications to be compatible or on par with our code, however. These changes are licensed under the same license as the other goon files. - -## License - -See LICENSE.md diff --git a/goon/icons/obj/hydroponics.dmi b/goon/icons/obj/hydroponics.dmi deleted file mode 100644 index 5fb5d4ed8dda..000000000000 Binary files a/goon/icons/obj/hydroponics.dmi and /dev/null differ diff --git a/goon/icons/obj/power.dmi b/goon/icons/obj/power.dmi deleted file mode 100644 index 8c1aff125755..000000000000 Binary files a/goon/icons/obj/power.dmi and /dev/null differ diff --git a/goon/icons/obj/surgery.dmi b/goon/icons/obj/surgery.dmi deleted file mode 100644 index c836fc16b152..000000000000 Binary files a/goon/icons/obj/surgery.dmi and /dev/null differ diff --git a/goon/sound/machinery/FireAlarm.ogg b/goon/sound/machinery/FireAlarm.ogg deleted file mode 100644 index f1a672326551..000000000000 Binary files a/goon/sound/machinery/FireAlarm.ogg and /dev/null differ diff --git a/goon/sound/machinery/printer_dotmatrix.ogg b/goon/sound/machinery/printer_dotmatrix.ogg deleted file mode 100644 index 272a2dab226d..000000000000 Binary files a/goon/sound/machinery/printer_dotmatrix.ogg and /dev/null differ diff --git a/html/changelogs/AutoChangeLog-pr-1724.yml b/html/changelogs/AutoChangeLog-pr-1724.yml deleted file mode 100644 index c7f573f2a53d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1724.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Latentish -delete-after: true -changes: - - rscadd: Adds a mimir (sleepy) - - code_imp: adds some supporting code for the mimir (sleepy) diff --git a/html/changelogs/AutoChangeLog-pr-1771.yml b/html/changelogs/AutoChangeLog-pr-1771.yml deleted file mode 100644 index 6de321e2682f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1771.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: spockye -delete-after: true -changes: - - rscadd: adds the pirate_cutter - - rscadd: adds the scar suit - - rscadd: misc frontiersmen jobs diff --git a/html/changelogs/AutoChangeLog-pr-1825.yml b/html/changelogs/AutoChangeLog-pr-1825.yml deleted file mode 100644 index 5c8c471fa9c0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1825.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: meemofcourse -delete-after: true -changes: - - tweak: Reworks the Twinkleshine diff --git a/html/changelogs/AutoChangeLog-pr-1834.yml b/html/changelogs/AutoChangeLog-pr-1834.yml deleted file mode 100644 index 3f66cf405702..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1834.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: retlaw34 -delete-after: true -changes: - - rscadd: Changes the airlock sounds diff --git a/html/changelogs/AutoChangeLog-pr-1839.yml b/html/changelogs/AutoChangeLog-pr-1839.yml deleted file mode 100644 index 8a71bb91f4c4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1839.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: Any%, Ryester, Azlan, Quantum M -delete-after: true -changes: - - rscadd: New wall sprites - - rscadd: New airlock sprite - - rscadd: New a lot of fucking sprites, see https://github.com/shiptest-ss13/Shiptest/pull/1838 - for more information - - rscadd: Updates almost every map in the game to fit any% walls - - rscadd: Dwayne has been updated diff --git a/html/changelogs/AutoChangeLog-pr-1853.yml b/html/changelogs/AutoChangeLog-pr-1853.yml deleted file mode 100644 index 8b4d17c66ae5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1853.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - tweak: The Kansatsu-Class is now available for spawning. diff --git a/html/changelogs/AutoChangeLog-pr-1882.yml b/html/changelogs/AutoChangeLog-pr-1882.yml deleted file mode 100644 index 9c333a6e2ecb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1882.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: thgvr -delete-after: true -changes: - - rscadd: Elzu now bleed, but do not have Liquid Electricity reagent as blood. (will - be changed in the future) - - rscadd: IPCs now "bleed" by leaking coolant - - rscadd: Sarathi now have teal-colored blood. - - rscadd: Blood will now dry over time - - rscadd: New bloody footprint sprites from bay - - refactor: Refactors a lot of blood code diff --git a/html/changelogs/AutoChangeLog-pr-1891.yml b/html/changelogs/AutoChangeLog-pr-1891.yml deleted file mode 100644 index 33336132527a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1891.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: thgvr -delete-after: true -changes: - - balance: Goliaths, Ice whelps, and Whitesands basilisks should be easier to kill - now. Try AP ammo. - - balance: Crushers no longer drop from legion bodies, only old crushers. - - balance: Tweaked how crushers distribute their damage. - - balance: Survivor suits no longer make you run at hyperspeed - - balance: Laser weaponry should be a little more effective versus most common fauna. - - bugfix: Added a sound to help show when a whitesands basilisk absorbs a bullet diff --git a/html/changelogs/AutoChangeLog-pr-1900.yml b/html/changelogs/AutoChangeLog-pr-1900.yml deleted file mode 100644 index eba4271e4981..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1900.yml +++ /dev/null @@ -1,12 +0,0 @@ -author: BogCreature -delete-after: true -changes: - - rscadd: TG fishing minigame - - rscadd: Aquariums - - rscadd: The ability to fish on beach, lava, and jungle planets - - rscadd: New outpost missions - - rscadd: New fishing related outpost crates - - rscdel: Removed flying fish from beach planets and made them into actual fish - - tweak: Increased the amount of outpost missions that generate at once from 15 - to 20 - - refactor: Refactored beam code to use signals diff --git a/html/changelogs/AutoChangeLog-pr-1908.yml b/html/changelogs/AutoChangeLog-pr-1908.yml deleted file mode 100644 index 39e26773279d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1908.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: BarteG44 -delete-after: true -changes: - - rscadd: Added carp spawner - - tweak: Reworked the fishing hut ruin diff --git a/html/changelogs/AutoChangeLog-pr-1914.yml b/html/changelogs/AutoChangeLog-pr-1914.yml deleted file mode 100644 index cf58feb3fee4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1914.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: FalloutFalcon -delete-after: true -changes: - - rscadd: Trickwines - - rscadd: Breakaway flasks! - - rscadd: Basic Trickwine brewing equipment to the SRM glaive - - imageadd: Sprites for breakaway flasks along with trick wine icons for them! - - code_imp: Breakaway_flask_icon_state = null used for the same purpose as the glass - and shot glass versions diff --git a/html/changelogs/AutoChangeLog-pr-1920.yml b/html/changelogs/AutoChangeLog-pr-1920.yml deleted file mode 100644 index 3162e4c879c5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1920.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: spockye -delete-after: true -changes: - - rscadd: Adds the Beluga class transport diff --git a/html/changelogs/AutoChangeLog-pr-1922.yml b/html/changelogs/AutoChangeLog-pr-1922.yml deleted file mode 100644 index ae804244d3bb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1922.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - rscdel: Disabled the Cricket diff --git a/html/changelogs/AutoChangeLog-pr-1930.yml b/html/changelogs/AutoChangeLog-pr-1930.yml deleted file mode 100644 index cb17a25431c6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1930.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - tweak: tendrils no longer emit a GPS signal. Go out and explore! diff --git a/html/changelogs/AutoChangeLog-pr-1933.yml b/html/changelogs/AutoChangeLog-pr-1933.yml deleted file mode 100644 index c89aae25c6f2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1933.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - imageadd: Most of the old hardsuits have been resprited diff --git a/html/changelogs/AutoChangeLog-pr-1937.yml b/html/changelogs/AutoChangeLog-pr-1937.yml deleted file mode 100644 index e4ef1029b39b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1937.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: thgvr -delete-after: true -changes: - - rscadd: Examining and other chat outputs now display in blocks to make them easier - to see diff --git a/html/changelogs/AutoChangeLog-pr-1940.yml b/html/changelogs/AutoChangeLog-pr-1940.yml deleted file mode 100644 index 4ef75fcb500d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1940.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscadd: Sand Planet hermits now have randomized inventories. And Hair. Sometimes. - - rscadd: Sand Planet hermits can now drop different races - - rscadd: legions will now drop a variety of species - - balance: drop rates for legions have been changed in a few spots. - - bugfix: hivelord.dm no longer sears my eyes out. diff --git a/html/changelogs/AutoChangeLog-pr-1942.yml b/html/changelogs/AutoChangeLog-pr-1942.yml deleted file mode 100644 index a069547bef10..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1942.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscadd: Tendrils now spawn from a list of creatures, instead of mono-creature, - with different levels of danger having a chance to spawn. - - balance: Demonic Portal Loot has been rebalanced. diff --git a/html/changelogs/AutoChangeLog-pr-1943.yml b/html/changelogs/AutoChangeLog-pr-1943.yml deleted file mode 100644 index 75ef37be9b3f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1943.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: AverageUser67 -delete-after: true -changes: - - bugfix: eluzose no longer have ethereal meat, or any kind of meat at all diff --git a/html/changelogs/AutoChangeLog-pr-1944.yml b/html/changelogs/AutoChangeLog-pr-1944.yml deleted file mode 100644 index 3638b11b0aa5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1944.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: MarkSuckerberg -delete-after: true -changes: - - admin: Adds ship purchasing bans. diff --git a/html/changelogs/AutoChangeLog-pr-1945.yml b/html/changelogs/AutoChangeLog-pr-1945.yml deleted file mode 100644 index 04f93989e833..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1945.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscadd: Waste planets now generate with biomes, please report any weirdness. diff --git a/html/changelogs/AutoChangeLog-pr-1946.yml b/html/changelogs/AutoChangeLog-pr-1946.yml deleted file mode 100644 index 38296cbff82e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1946.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: phoaly -delete-after: true -changes: - - rscadd: Added shipturfs - - rscdel: Old planetary turf subtypes - - bugfix: Fixed water turfs runtiming when hit with a bat - - bugfix: Replaced tiles on the Glaive and Shepherd - - tweak: Swapped the montagnes ID - - tweak: Nerfed Glaive mining gear diff --git a/html/changelogs/AutoChangeLog-pr-1947.yml b/html/changelogs/AutoChangeLog-pr-1947.yml deleted file mode 100644 index 78410b544d25..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1947.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Merlin1230 -delete-after: true -changes: - - bugfix: Fixed the Colonial Minuteman General Coat's worn sprite, so it actually - shows up diff --git a/html/changelogs/AutoChangeLog-pr-1952.yml b/html/changelogs/AutoChangeLog-pr-1952.yml deleted file mode 100644 index bdfbd0c6fa06..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1952.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: spockye -delete-after: true -changes: - - bugfix: fixed some things on the Cepheus class diff --git a/html/changelogs/AutoChangeLog-pr-1953.yml b/html/changelogs/AutoChangeLog-pr-1953.yml deleted file mode 100644 index ada9616e8929..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1953.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Hibou48888 -delete-after: true -changes: - - code_imp: multitools now change the alt+click behavior of an ORM - - tweak: ORMs can now have their input and output tiles onto the same tile, or two - tiles at a right angle, as well as the old behavior of having them on opposite - sides of the machine diff --git a/html/changelogs/AutoChangeLog-pr-1957.yml b/html/changelogs/AutoChangeLog-pr-1957.yml deleted file mode 100644 index 89a16e1219d7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1957.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Zevotech -delete-after: true -changes: - - rscadd: The energy halberd, a previously unfinished weapon. Comes in 5 colors - and a hacked rainbow version. - - bugfix: Rainbow energy weapon sprites now actually follow rainbow order diff --git a/html/changelogs/AutoChangeLog-pr-1958.yml b/html/changelogs/AutoChangeLog-pr-1958.yml deleted file mode 100644 index 829fca8c118d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1958.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - balance: Fixes RnD balance diff --git a/html/changelogs/AutoChangeLog-pr-1959.yml b/html/changelogs/AutoChangeLog-pr-1959.yml deleted file mode 100644 index abe4d88aa5d7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1959.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: AverageUser67 -delete-after: true -changes: - - balance: you can actually recycle syndicate walls now diff --git a/html/changelogs/AutoChangeLog-pr-1961.yml b/html/changelogs/AutoChangeLog-pr-1961.yml deleted file mode 100644 index 50f5fc3ac8de..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1961.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscadd: Chickens will now infrequently spawn on jungle planets diff --git a/html/changelogs/AutoChangeLog-pr-1962.yml b/html/changelogs/AutoChangeLog-pr-1962.yml deleted file mode 100644 index 92ea44060f21..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1962.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: mystery3525 -delete-after: true -changes: - - tweak: added more admin-relevant features to the Shuttle Manipulator - - bugfix: removed repeat in the Shuttle Manipulator diff --git a/html/changelogs/AutoChangeLog-pr-1963.yml b/html/changelogs/AutoChangeLog-pr-1963.yml deleted file mode 100644 index f23e0d6716a4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1963.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: mystery3525 -delete-after: true -changes: - - tweak: moved the skipper's pipes diff --git a/html/changelogs/AutoChangeLog-pr-1964.yml b/html/changelogs/AutoChangeLog-pr-1964.yml deleted file mode 100644 index d77d862d4ed7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1964.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: BarteG44 -delete-after: true -changes: - - bugfix: fixed belts not appearing on player sprites diff --git a/html/changelogs/AutoChangeLog-pr-1965.yml b/html/changelogs/AutoChangeLog-pr-1965.yml deleted file mode 100644 index 6f1c04f982fb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1965.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: mystery3525 -delete-after: true -changes: - - rscadd: Gave engineering cyborgs their own shuttle manipulation blueprints diff --git a/html/changelogs/AutoChangeLog-pr-1968.yml b/html/changelogs/AutoChangeLog-pr-1968.yml deleted file mode 100644 index 3cbab69be7cd..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1968.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: PositiveEntropy, MarkSuckerberg, TetraZeta, PiperDoots -delete-after: true -changes: - - rscadd: The start of new SolGov! Expect a new and improved SolGov to now roam - the frontier! - - rscdel: Removes many old jobs and content related to Old Solgov. - - rscdel: Fully deprecates the Cricket-Class. - - rscdel: Fully deprecates the Liberty-Class. - - code_imp: Adds the worn_y_offset variable, making offsetting hats much easier. diff --git a/html/changelogs/AutoChangeLog-pr-1969.yml b/html/changelogs/AutoChangeLog-pr-1969.yml deleted file mode 100644 index bf3cc178666e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1969.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: meemofcourse -delete-after: true -changes: - - rscadd: Added observer_start landmarks to all ships diff --git a/html/changelogs/AutoChangeLog-pr-1970.yml b/html/changelogs/AutoChangeLog-pr-1970.yml deleted file mode 100644 index a540452328eb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1970.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: dragomagol -delete-after: true -changes: - - bugfix: alien tools have working icon states diff --git a/html/changelogs/AutoChangeLog-pr-1973.yml b/html/changelogs/AutoChangeLog-pr-1973.yml deleted file mode 100644 index 8dd082e99ab3..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1973.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - rscadd: Added the Inteq SsG-04 marksman rifle - - tweak: Improved IRMG gunsprites diff --git a/html/changelogs/AutoChangeLog-pr-1974.yml b/html/changelogs/AutoChangeLog-pr-1974.yml deleted file mode 100644 index 52ab06168e14..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1974.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - rscdel: Removed the Lamia-class wizard ship diff --git a/html/changelogs/AutoChangeLog-pr-1975.yml b/html/changelogs/AutoChangeLog-pr-1975.yml deleted file mode 100644 index 11746e92f143..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1975.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bokkiewokkie -delete-after: true -changes: - - admin: Renaming ships is now recorded in the admin log diff --git a/html/changelogs/AutoChangeLog-pr-1976.yml b/html/changelogs/AutoChangeLog-pr-1976.yml deleted file mode 100644 index c44a9946e0b5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1976.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: spockye -delete-after: true -changes: - - bugfix: fixed small jungle trees spawning with false icon states diff --git a/html/changelogs/AutoChangeLog-pr-1978.yml b/html/changelogs/AutoChangeLog-pr-1978.yml deleted file mode 100644 index 4b5061db6ad1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1978.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: PositiveEntropy, PiperDoots, TripleZeta -delete-after: true -changes: - - imageadd: New SolGov jobs now exist, as well as respective equipment for them! - - imageadd: The SolGov Seal and Flag have been added and remade! - - code_imp: A new IFF flag has been added for SolGov, making those turrets able - to target non-SolGov aligned people! - - rscdel: Removes even more old SolGov content. Good riddance. diff --git a/html/changelogs/AutoChangeLog-pr-1979.yml b/html/changelogs/AutoChangeLog-pr-1979.yml deleted file mode 100644 index f6c8159cf603..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1979.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscdel: The tide has lost R&D, its medical gear, and the RCD/RPD diff --git a/html/changelogs/AutoChangeLog-pr-1980.yml b/html/changelogs/AutoChangeLog-pr-1980.yml deleted file mode 100644 index 5a7e0e6b3c0e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1980.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: spockye -delete-after: true -changes: - - rscdel: Removed seed vendor restock from the mimir class diff --git a/html/changelogs/AutoChangeLog-pr-1983.yml b/html/changelogs/AutoChangeLog-pr-1983.yml deleted file mode 100644 index b1043646962f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1983.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: goober3 -delete-after: true -changes: - - bugfix: Plasteel stairs have regained their shade. diff --git a/html/changelogs/AutoChangeLog-pr-1986.yml b/html/changelogs/AutoChangeLog-pr-1986.yml deleted file mode 100644 index 52e01bebe97b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1986.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Latentish -delete-after: true -changes: - - tweak: disables the Mimir class diff --git a/html/changelogs/AutoChangeLog-pr-1987.yml b/html/changelogs/AutoChangeLog-pr-1987.yml deleted file mode 100644 index 29d55c10d5ea..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1987.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - rscdel: PDAs, Modcomps, AIs, and pAIs no longer have a crew manifest option. diff --git a/html/changelogs/AutoChangeLog-pr-1988.yml b/html/changelogs/AutoChangeLog-pr-1988.yml deleted file mode 100644 index b2da2ff58f67..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1988.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - balance: Cryo sleep will now make you nauseous and hungry when you wake up. diff --git a/html/changelogs/AutoChangeLog-pr-1992.yml b/html/changelogs/AutoChangeLog-pr-1992.yml deleted file mode 100644 index fb8edc602b17..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1992.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - tweak: The MOTD has been updated diff --git a/html/changelogs/AutoChangeLog-pr-1993.yml b/html/changelogs/AutoChangeLog-pr-1993.yml deleted file mode 100644 index 9ec1f6c71b6a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1993.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Hibou48888 -delete-after: true -changes: - - tweak: reduced Kilo crew count from 8 to 5, removed Foreman diff --git a/html/changelogs/AutoChangeLog-pr-1994.yml b/html/changelogs/AutoChangeLog-pr-1994.yml deleted file mode 100644 index 5062d8436d65..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1994.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: PositiveEntropy, PiperDoots -delete-after: true -changes: - - imageadd: Resprites the SolGov letter opener! - - imageadd: Adds Solarian Sabres! - - imageadd: Adds SolGov and TerraGov folders! - - imageadd: New floor decals for SolGov have been added! diff --git a/html/changelogs/AutoChangeLog-pr-1995.yml b/html/changelogs/AutoChangeLog-pr-1995.yml deleted file mode 100644 index 40c6d9ba9778..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1995.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SirConway -delete-after: true -changes: - - bugfix: changed the RIG heat suit to use its own helmet instead of the prototype's diff --git a/html/changelogs/AutoChangeLog-pr-1999.yml b/html/changelogs/AutoChangeLog-pr-1999.yml deleted file mode 100644 index 723fa0f33533..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1999.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Ebin-Halcyon -delete-after: true -changes: - - imageadd: IRMG clothing has been resprited with a cleaner color palette. - - rscadd: an IRMG spacesuit and an alternative drop pouch webbing sprite. currently - not in game but will be down the line. diff --git a/html/changelogs/AutoChangeLog-pr-2000.yml b/html/changelogs/AutoChangeLog-pr-2000.yml deleted file mode 100644 index 308a5faec601..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2000.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Stiel0248, Positive entropy -delete-after: true -changes: - - imageadd: Resprites the flyswatter diff --git a/html/changelogs/AutoChangeLog-pr-2002.yml b/html/changelogs/AutoChangeLog-pr-2002.yml deleted file mode 100644 index ddd193d8ec8f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2002.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - spellcheck: Fixed some grammar inconsistencies with Elzuosa/Elzuose diff --git a/html/changelogs/AutoChangeLog-pr-2004.yml b/html/changelogs/AutoChangeLog-pr-2004.yml deleted file mode 100644 index 387bb6dfa40d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2004.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PigeonVerde#8826 -delete-after: true -changes: - - rscadd: Ports mothplushies from Beestation - - rscadd: Ports flushedplush from Beestation diff --git a/html/changelogs/AutoChangeLog-pr-2005.yml b/html/changelogs/AutoChangeLog-pr-2005.yml deleted file mode 100644 index ec9693959489..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2005.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: spockye -delete-after: true -changes: - - rscadd: Ports the BLT from TG diff --git a/html/changelogs/AutoChangeLog-pr-2006.yml b/html/changelogs/AutoChangeLog-pr-2006.yml deleted file mode 100644 index a29f13ac4738..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2006.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: spockye -delete-after: true -changes: - - rscadd: Ports updated food container sprites from TG diff --git a/html/changelogs/AutoChangeLog-pr-2007.yml b/html/changelogs/AutoChangeLog-pr-2007.yml deleted file mode 100644 index 19fa590b5331..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2007.yml +++ /dev/null @@ -1,15 +0,0 @@ -author: BarteG44 -delete-after: true -changes: - - rscadd: Added Pizza cutters - - rscadd: Added black and purple office chairs - - tweak: tweaked how racks stack items - - tweak: renames armbands from departments to their colors and adds them to clothes - vendors - - tweak: made utility belts able to hold decal painters and etc. - - tweak: adds a little more variety to the chem table sprite - - tweak: makes the decal painter's decals more resistant to cleaning - - bugfix: fixed being unable to make and color modern railings - - bugfix: fixed up some tiles on the box and li tieguai class - - bugfix: fixes a typo on the box class engine shutter and reworks it's bathroom - - bugfix: fixes the justice helmet at last. rejoice! diff --git a/html/changelogs/AutoChangeLog-pr-2008.yml b/html/changelogs/AutoChangeLog-pr-2008.yml deleted file mode 100644 index f31e9abce7f2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2008.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - tweak: The BYO has been made Aspawn diff --git a/html/changelogs/AutoChangeLog-pr-2012.yml b/html/changelogs/AutoChangeLog-pr-2012.yml deleted file mode 100644 index f2b5c113f683..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2012.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - balance: Engine prechargers now start with a 5kw charge leve. diff --git a/html/changelogs/AutoChangeLog-pr-2015.yml b/html/changelogs/AutoChangeLog-pr-2015.yml deleted file mode 100644 index 097517c30a61..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2015.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - rscdel: Removed the HighTide and TrunkTide - - rscdel: deprecated the Tide diff --git a/html/changelogs/AutoChangeLog-pr-2016.yml b/html/changelogs/AutoChangeLog-pr-2016.yml deleted file mode 100644 index 46baa2f65180..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2016.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: stiel#0248 -delete-after: true -changes: - - rscadd: Added seaweed / seaweedsheets / seaweed seeds - - rscadd: Added freegrowing seaweed patches (only in beach planet waters) - - rscadd: Added new sushi dishes (vegetariansushiroll/spicysushiroll/nigirisushi/fishi) - - rscadd: Added new misc dishes (onigiri/eggrolls) diff --git a/html/changelogs/AutoChangeLog-pr-2017.yml b/html/changelogs/AutoChangeLog-pr-2017.yml deleted file mode 100644 index 159c6d1fe4e5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2017.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: PigeonVerde#8826 -delete-after: true -changes: - - rscadd: Added double beds diff --git a/html/changelogs/AutoChangeLog-pr-2019.yml b/html/changelogs/AutoChangeLog-pr-2019.yml deleted file mode 100644 index ff17a48221c4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2019.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - rscadd: Attack animations are now functional diff --git a/html/changelogs/AutoChangeLog-pr-2020.yml b/html/changelogs/AutoChangeLog-pr-2020.yml deleted file mode 100644 index ca5ac92748f4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2020.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - rscadd: Sarathi accents speaking Common are now a little more thick. diff --git a/html/changelogs/AutoChangeLog-pr-2021.yml b/html/changelogs/AutoChangeLog-pr-2021.yml deleted file mode 100644 index 0fd0aec4ac69..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2021.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - rscadd: Being on harm intent will cause your character to face your mouse. diff --git a/html/changelogs/AutoChangeLog-pr-2023.yml b/html/changelogs/AutoChangeLog-pr-2023.yml deleted file mode 100644 index e6d76bcf7031..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2023.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Fulgro -delete-after: true -changes: - - rscdel: booty borg code - - rscdel: booty borg sprites diff --git a/html/changelogs/AutoChangeLog-pr-2024.yml b/html/changelogs/AutoChangeLog-pr-2024.yml deleted file mode 100644 index 001130dc156d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2024.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: NithaTheTired -delete-after: true -changes: - - rscadd: Allows pixel shifted players to not be pushed around depending on direction. diff --git a/html/changelogs/AutoChangeLog-pr-2027.yml b/html/changelogs/AutoChangeLog-pr-2027.yml deleted file mode 100644 index 0eefc5ae0403..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2027.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscdel: Radios no longer tell you the job of people using them diff --git a/html/changelogs/AutoChangeLog-pr-2030.yml b/html/changelogs/AutoChangeLog-pr-2030.yml deleted file mode 100644 index 92223e4d3a3d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2030.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - rscadd: Added a Master-at-Arms to the Colossus - - tweak: Redesigned the Colossus's armory diff --git a/html/changelogs/AutoChangeLog-pr-2031.yml b/html/changelogs/AutoChangeLog-pr-2031.yml deleted file mode 100644 index adfb100648cc..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2031.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: PositiveEntropy -delete-after: true -changes: - - imageadd: SolGov stamps are now a thing! Use them to give your documentation some - Solarian approval! - - rscadd: You can now put halberds on your back slot! - - bugfix: Adjusted some outfit code further, making it all fully functional *and* - compliant! - - balance: The SolGov vacsuit now has a more environmental protection focus and - the SolGov hardsuit had its radiation protection toned down. diff --git a/html/changelogs/AutoChangeLog-pr-2032.yml b/html/changelogs/AutoChangeLog-pr-2032.yml deleted file mode 100644 index 3a0ea8b9cc9c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2032.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - tweak: Updated Talos with new assets, adjusted engine and job slots diff --git a/html/changelogs/AutoChangeLog-pr-2035.yml b/html/changelogs/AutoChangeLog-pr-2035.yml deleted file mode 100644 index c6c65791522a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2035.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Nitha -delete-after: true -changes: - - rscadd: Cleaning now has an effect and sound. diff --git a/html/changelogs/AutoChangeLog-pr-2037.yml b/html/changelogs/AutoChangeLog-pr-2037.yml deleted file mode 100644 index d17af4ef3bf0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2037.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: NithaTheTired -delete-after: true -changes: - - rscadd: you can now buckle to things while on adjacent tiles - - bugfix: fixed a bug where you could climb the table you are standing on diff --git a/html/changelogs/AutoChangeLog-pr-2040.yml b/html/changelogs/AutoChangeLog-pr-2040.yml deleted file mode 100644 index 38602893a9d1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2040.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: BarteG44 -delete-after: true -changes: - - tweak: tweaked the modern railing sprite diff --git a/html/changelogs/AutoChangeLog-pr-2041.yml b/html/changelogs/AutoChangeLog-pr-2041.yml deleted file mode 100644 index 667f52cf2dd8..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2041.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: BarteG44 -delete-after: true -changes: - - bugfix: fixed decal painter's decals not getting colored diff --git a/html/changelogs/AutoChangeLog-pr-2043.yml b/html/changelogs/AutoChangeLog-pr-2043.yml deleted file mode 100644 index 32fce16d848c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2043.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscadd: More Ship Names diff --git a/html/changelogs/AutoChangeLog-pr-2044.yml b/html/changelogs/AutoChangeLog-pr-2044.yml deleted file mode 100644 index 038f3de4d39f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2044.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscdel: away mission templates diff --git a/html/changelogs/AutoChangeLog-pr-2045.yml b/html/changelogs/AutoChangeLog-pr-2045.yml deleted file mode 100644 index 53b594a44017..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2045.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Zevotech -delete-after: true -changes: - - bugfix: Syndicate Battle Dome (provinggrounds.dmm) should now have a functional - SMES and airlocks/blast doors. - - bugfix: Syndicate Battle Dome (provinggrounds.dmm) no longer has ~20 black box - recorders and now only has one. diff --git a/html/changelogs/AutoChangeLog-pr-2048.yml b/html/changelogs/AutoChangeLog-pr-2048.yml deleted file mode 100644 index d6fc381461b4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2048.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thgvr -delete-after: true -changes: - - bugfix: Sarathi and Elzu tails/bits wont be eaten by suits anymore diff --git a/html/changelogs/AutoChangeLog-pr-2051.yml b/html/changelogs/AutoChangeLog-pr-2051.yml deleted file mode 100644 index ed1b5b6d1a5d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2051.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - code_imp: solgov sabre belts are now a subtype of sabre belts - - imageadd: sabre sprites from tg, originally done by eris, touched up by imaginos, - redone by viro, and then ported here by me. - - imageadd: sabre belt inhands, done by InGorer for /tg/ station diff --git a/html/changelogs/AutoChangeLog-pr-2054.yml b/html/changelogs/AutoChangeLog-pr-2054.yml deleted file mode 100644 index 2c143d7944be..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2054.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: PositiveEntropy -delete-after: true -changes: - - rscdel: Removes several unused floor types, as well as completely annihilating - the "monofloor" and "dirty" floor types, and the "edge" decal type. - - imageadd: Redoes the floors using the TileTest tileset! diff --git a/html/changelogs/AutoChangeLog-pr-2055.yml b/html/changelogs/AutoChangeLog-pr-2055.yml deleted file mode 100644 index c9fdaca14a79..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2055.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: axelzonvolt -delete-after: true -changes: - - tweak: rewrote the config.jsons for the meta, boyardee and box-class ships to - enforce proper headset pathing instead of resorting to default path, which is - NT apparently? diff --git a/html/changelogs/AutoChangeLog-pr-2057.yml b/html/changelogs/AutoChangeLog-pr-2057.yml deleted file mode 100644 index ed5b1af2b1b5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2057.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: retlaw34 -delete-after: true -changes: - - rscadd: New hydroponic tray sprites diff --git a/html/changelogs/AutoChangeLog-pr-2058.yml b/html/changelogs/AutoChangeLog-pr-2058.yml deleted file mode 100644 index d1e09f39af41..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2058.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: retlaw34 -delete-after: true -changes: - - rscadd: Adds 2 new posters - - bugfix: Some posters were fixed and tweaked. diff --git a/html/changelogs/AutoChangeLog-pr-2063.yml b/html/changelogs/AutoChangeLog-pr-2063.yml deleted file mode 100644 index 2f4acfbd74fa..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2063.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Bjarl -delete-after: true -changes: - - rscdel: Everything Deepcore Mining diff --git a/html/changelogs/AutoChangeLog-pr-2064.yml b/html/changelogs/AutoChangeLog-pr-2064.yml deleted file mode 100644 index 2cb3831ebdb4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2064.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Orchidthederg -delete-after: true -changes: - - tweak: Replaced Bar Tables in all maps where present diff --git a/html/changelogs/AutoChangeLog-pr-2065.yml b/html/changelogs/AutoChangeLog-pr-2065.yml deleted file mode 100644 index 4ef729320546..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2065.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Nitha -delete-after: true -changes: - - tweak: Various cleanbot improvements. diff --git a/html/changelogs/AutoChangeLog-pr-2078.yml b/html/changelogs/AutoChangeLog-pr-2078.yml deleted file mode 100644 index d7904b0c4ba8..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2078.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -delete-after: true -changes: - - rscdel: Removed the Solar-class diff --git a/html/changelogs/archive/2023-06.yml b/html/changelogs/archive/2023-06.yml new file mode 100644 index 000000000000..55aec1f5ef95 --- /dev/null +++ b/html/changelogs/archive/2023-06.yml @@ -0,0 +1,271 @@ +2023-06-22: + Any%, Ryester, Azlan, Quantum M: + - rscadd: New wall sprites + - rscadd: New airlock sprite + - rscadd: New a lot of fucking sprites, see https://github.com/shiptest-ss13/Shiptest/pull/1838 + for more information + - rscadd: Updates almost every map in the game to fit any% walls + - rscadd: Dwayne has been updated + Apogee-dev: + - rscdel: Disabled the Cricket + - tweak: Updated Talos with new assets, adjusted engine and job slots + - rscadd: Added a Master-at-Arms to the Colossus + - tweak: Redesigned the Colossus's armory + - rscadd: Added the Inteq SsG-04 marksman rifle + - tweak: Improved IRMG gunsprites + - rscdel: Removed the Lamia-class wizard ship + - rscdel: Removed the Solar-class + - rscdel: Removed the HighTide and TrunkTide + - rscdel: deprecated the Tide + - balance: Fixes RnD balance + - rscdel: Disabled research nodes for nanites + AverageUser67: + - balance: you can actually recycle syndicate walls now + - bugfix: eluzose no longer have ethereal meat, or any kind of meat at all + BarteG44: + - rscadd: Added carp spawner + - tweak: Reworked the fishing hut ruin + - tweak: tweaked the modern railing sprite + - rscadd: Added Pizza cutters + - rscadd: Added black and purple office chairs + - tweak: tweaked how racks stack items + - tweak: renames armbands from departments to their colors and adds them to clothes + vendors + - tweak: made utility belts able to hold decal painters and etc. + - tweak: adds a little more variety to the chem table sprite + - tweak: makes the decal painter's decals more resistant to cleaning + - bugfix: fixed being unable to make and color modern railings + - bugfix: fixed up some tiles on the box and li tieguai class + - bugfix: fixes a typo on the box class engine shutter and reworks it's bathroom + - bugfix: fixes the justice helmet at last. rejoice! + - bugfix: fixed belts not appearing on player sprites + - bugfix: fixed decal painter's decals not getting colored + Bjarl: + - tweak: The MOTD has been updated + - balance: Cryopods now apply a range of effects to you when you wake up. + - tweak: The Kansatsu-Class is now available for spawning. + - rscdel: The tide has lost R&D, its medical gear, and the RCD/RPD + - tweak: The BYO has been made Aspawn + - rscadd: Chickens will now infrequently spawn on jungle planets + - rscdel: Radios no longer tell you the job of people using them + - code_imp: solgov sabre belts are now a subtype of sabre belts + - imageadd: sabre sprites from tg, originally done by eris, touched up by imaginos, + redone by viro, and then ported here by me. + - imageadd: sabre belt inhands, done by InGorer for /tg/ station + - tweak: tendrils no longer emit a GPS signal. Go out and explore! + - rscadd: Sand Planet hermits now have randomized inventories. And Hair. Sometimes. + - rscadd: Sand Planet hermits can now drop different races + - rscadd: legions will now drop a variety of species + - balance: drop rates for legions have been changed in a few spots. + - bugfix: hivelord.dm no longer sears my eyes out. + - rscdel: away mission templates + - rscadd: Tendrils now spawn from a list of creatures, instead of mono-creature, + with different levels of danger having a chance to spawn. + - balance: Demonic Portal Loot has been rebalanced. + - rscadd: More Ship Names + - rscdel: Everything Deepcore Mining + - rscadd: Waste planets now generate with biomes, please report any weirdness. + BogCreature: + - rscadd: TG fishing minigame + - rscadd: Aquariums + - rscadd: The ability to fish on beach, lava, and jungle planets + - rscadd: New outpost missions + - rscadd: New fishing related outpost crates + - rscdel: Removed flying fish from beach planets and made them into actual fish + - tweak: Increased the amount of outpost missions that generate at once from 15 + to 20 + - refactor: Refactored beam code to use signals + Bokkiewokkie: + - admin: Renaming ships is now recorded in the admin log + Ebin-Halcyon: + - imageadd: IRMG clothing has been resprited with a cleaner color palette. + - rscadd: an IRMG spacesuit and an alternative drop pouch webbing sprite. currently + not in game but will be down the line. + FalloutFalcon: + - rscadd: Trickwines + - rscadd: Breakaway flasks! + - rscadd: Basic Trickwine brewing equipment to the SRM glaive + - imageadd: Sprites for breakaway flasks along with trick wine icons for them! + - code_imp: Breakaway_flask_icon_state = null used for the same purpose as the glass + and shot glass versions + Fulgro: + - rscdel: booty borg code + - rscdel: booty borg sprites + Hibou48888: + - tweak: reduced Kilo crew count from 8 to 5, removed Foreman + - code_imp: multitools now change the alt+click behavior of an ORM + - tweak: ORMs can now have their input and output tiles onto the same tile, or two + tiles at a right angle, as well as the old behavior of having them on opposite + sides of the machine + Latentish: + - rscadd: Adds a mimir (sleepy) + - code_imp: adds some supporting code for the mimir (sleepy) + - tweak: disables the Mimir class + MarkSuckerberg: + - admin: Adds ship purchasing bans. + - bugfix: Ships can no longer burn while docked to something. + Merlin1230: + - bugfix: Fixed the Colonial Minuteman General Coat's worn sprite, so it actually + shows up + Nitha: + - rscadd: Cleaning now has an effect and sound. + - tweak: Various cleanbot improvements. + NithaTheTired: + - rscadd: you can now buckle to things while on adjacent tiles + - bugfix: fixed a bug where you could climb the table you are standing on + - rscadd: Allows pixel shifted players to not be pushed around depending on direction. + Orchidthederg: + - tweak: Replaced Bar Tables in all maps where present + PigeonVerde#8826: + - rscadd: Added double beds + - rscadd: Ports mothplushies from Beestation + - rscadd: Ports flushedplush from Beestation + PositiveEntropy: + - imageadd: SolGov stamps are now a thing! Use them to give your documentation some + Solarian approval! + - rscadd: You can now put halberds on your back slot! + - bugfix: Adjusted some outfit code further, making it all fully functional *and* + compliant! + - balance: The SolGov vacsuit now has a more environmental protection focus and + the SolGov hardsuit had its radiation protection toned down. + - rscdel: Removes several unused floor types, as well as completely annihilating + the "monofloor" and "dirty" floor types, and the "edge" decal type. + - imageadd: Redoes the floors using the TileTest tileset! + PositiveEntropy, MarkSuckerberg, TetraZeta, PiperDoots: + - rscadd: The start of new SolGov! Expect a new and improved SolGov to now roam + the frontier! + - rscdel: Removes many old jobs and content related to Old Solgov. + - rscdel: Fully deprecates the Cricket-Class. + - rscdel: Fully deprecates the Liberty-Class. + - code_imp: Adds the worn_y_offset variable, making offsetting hats much easier. + PositiveEntropy, PiperDoots: + - imageadd: Resprites the SolGov letter opener! + - imageadd: Adds Solarian Sabres! + - imageadd: Adds SolGov and TerraGov folders! + - imageadd: New floor decals for SolGov have been added! + PositiveEntropy, PiperDoots, TripleZeta: + - imageadd: New SolGov jobs now exist, as well as respective equipment for them! + - imageadd: The SolGov Seal and Flag have been added and remade! + - code_imp: A new IFF flag has been added for SolGov, making those turrets able + to target non-SolGov aligned people! + - rscdel: Removes even more old SolGov content. Good riddance. + SirConway: + - bugfix: changed the RIG heat suit to use its own helmet instead of the prototype's + Stiel0248, Positive entropy: + - imageadd: Resprites the flyswatter + Zevotech: + - rscadd: The energy halberd, a previously unfinished weapon. Comes in 5 colors + and a hacked rainbow version. + - bugfix: Rainbow energy weapon sprites now actually follow rainbow order + - bugfix: Syndicate Battle Dome (provinggrounds.dmm) should now have a functional + SMES and airlocks/blast doors. + - bugfix: Syndicate Battle Dome (provinggrounds.dmm) no longer has ~20 black box + recorders and now only has one. + axelzonvolt: + - tweak: rewrote the config.jsons for the meta, boyardee and box-class ships to + enforce proper headset pathing instead of resorting to default path, which is + NT apparently? + dragomagol: + - bugfix: alien tools have working icon states + goober3: + - bugfix: Plasteel stairs have regained their shade. + meemofcourse: + - tweak: Reworks the Twinkleshine + - rscadd: Added observer_start landmarks to all ships + mystery3525: + - rscadd: Gave engineering cyborgs their own shuttle manipulation blueprints + - tweak: moved the skipper's pipes + - tweak: added more admin-relevant features to the Shuttle Manipulator + - bugfix: removed repeat in the Shuttle Manipulator + phoaly: + - rscadd: Added shipturfs + - rscdel: Old planetary turf subtypes + - bugfix: Fixed water turfs runtiming when hit with a bat + - bugfix: Replaced tiles on the Glaive and Shepherd + - tweak: Swapped the montagnes ID + - tweak: Nerfed Glaive mining gear + retlaw34: + - rscadd: Changes the airlock sounds + - rscadd: New hydroponic tray sprites + - rscadd: Adds 2 new posters + - bugfix: Some posters were fixed and tweaked. + spockye: + - rscadd: Adds the Beluga class transport + - tweak: replaced the seed vendor on the ember with the broken variant and some + scattered seeds + - bugfix: fixed some things on the Cepheus class + - rscadd: adds the pirate_cutter + - rscadd: adds the scar suit + - rscadd: misc frontiersmen jobs + - rscadd: Ports updated food container sprites from TG + - rscadd: Ports the BLT from TG + - bugfix: fixed small jungle trees spawning with false icon states + - rscdel: Removed seed vendor restock from the mimir class + stiel#0248: + - rscadd: Added seaweed / seaweedsheets / seaweed seeds + - rscadd: Added freegrowing seaweed patches (only in beach planet waters) + - rscadd: Added new sushi dishes (vegetariansushiroll/spicysushiroll/nigirisushi/fishi) + - rscadd: Added new misc dishes (onigiri/eggrolls) + thgvr: + - imageadd: Most of the old hardsuits have been resprited + - rscadd: Elzu now bleed, but do not have Liquid Electricity reagent as blood. (will + be changed in the future) + - rscadd: IPCs now "bleed" by leaking coolant + - rscadd: Sarathi now have teal-colored blood. + - rscadd: Blood will now dry over time + - rscadd: New bloody footprint sprites from bay + - refactor: Refactors a lot of blood code + - rscadd: Examining and other chat outputs now display in blocks to make them easier + to see + - rscadd: Being on harm intent will cause your character to face your mouse. + - rscdel: PDAs, Modcomps, AIs, and pAIs no longer have a crew manifest option. + - bugfix: Sarathi and Elzu tails/bits wont be eaten by suits anymore + - spellcheck: Fixed some grammar inconsistencies with Elzuosa/Elzuose + - balance: Engine prechargers now start with a 5kw charge leve. + - rscadd: Sarathi accents speaking Common are now a little more thick. + - balance: Cryo sleep will now make you nauseous and hungry when you wake up. + - balance: Goliaths, Ice whelps, and Whitesands basilisks should be easier to kill + now. Try AP ammo. + - balance: Crushers no longer drop from legion bodies, only old crushers. + - balance: Tweaked how crushers distribute their damage. + - balance: Survivor suits no longer make you run at hyperspeed + - balance: Laser weaponry should be a little more effective versus most common fauna. + - bugfix: Added a sound to help show when a whitesands basilisk absorbs a bullet + - rscdel: Removed maid box in loadout + - rscadd: Attack animations are now functional + tmtmtl30: + - tweak: Lava planets have been cooled below plasma's ignition temperature. +2023-06-24: + phoaly: + - rscadd: Added descriptions to all jsons + - rscadd: Added tags to all ship jsons + - rscadd: Added Ship Tags and descriptions to the ship purchase/join/shuttle manipulator + menus + - rscadd: Added tag manipulation to the ship editor + - tweak: Tweaks the UI of the shuttle manipulator +2023-06-25: + Bjarl: + - rscadd: Vela-Class Industrial Cruiser, a large CMM Ship built around mechs and + mining + PrefabQuasar: + - rscadd: added the Junker-class salvage(d) ship + - rscadd: added the reployer + - rscdel: removed the trunktide (older version of the junker) +2023-06-27: + Bjarl: + - bugfix: chicken flocks will now spawn + tmtmtl30: + - bugfix: Different planets should hopefully no longer repeatedly generate in the + exact same part of the map, overwriting each other and causing double-dock SGTs. +2023-06-28: + Arturlang: + - bugfix: Prettier should now work on VSCode again. + thgvr: + - rscadd: The Solarian Marine Society has begun mass production of a cute, marketable + plushie of their mascot. May be favored by vampires. Sprites by INFRARED_BARON. + - bugfix: Potentially fixed a lot of lag related to pipes +2023-06-30: + axelzonvolt: + - tweak: actually adds shaft miner outfit pathing to the meta-class.json + linkylink21: + - bugfix: Added Missing APCs to the Osprey diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml new file mode 100644 index 000000000000..ecf3ad0daa00 --- /dev/null +++ b/html/changelogs/archive/2023-07.yml @@ -0,0 +1,207 @@ +2023-07-01: + Bjarl, Ghilker, Comyx, Assorted /tg/ contributors: + - rscadd: anomalies will now randomly spawn on planets + - rscadd: bioscrambler anomalies, they randomly change your organs and bodyparts + - rscadd: hallucination anomalies, they cause hallucinations + - rscadd: big anomalies, they're like normal anomalies but big. + - bugfix: disk renaming should only work with pens now +2023-07-02: + BarteG44: + - rscadd: Makes graves buildable + Ryll-Ryll/Shaps: + - admin: Adds pinging to adminsay! + - admin: Adds the ability to link datums! + - admin: 'Adds linking tickets to asay! Simply put a # followed by a ticket number + for it to be linked in the chat!' + thgvr: + - rscadd: A metric ton of Vox sprites + - rscdel: Vox no longer need environmental regulators + tmtmtl30: + - tweak: There is now a cap on the number of ships that may be spawned by players + in a round. + - tweak: Spawning a ship, or joining as an officer on a ship, may now carry a playtime + requirement. + - bugfix: 'Ship limits have been fixed: Many ships can only be spawned a finite + number of times per round.' + - admin: Admins may now disable join menu ship spawning. +2023-07-03: + thgvr: + - bugfix: Mining vendors have scanners again +2023-07-04: + retlaw34: + - rscadd: You now have 20 character slots! +2023-07-05: + BarteG44: + - rscadd: Added chemical crates + - rscadd: Added chemical jugs + - balance: moved the chem dispenser to applied bluespace research + MemedHams: + - rscadd: Gives holofields a glow up. + - tweak: Adjusts holofield layering so the emitters are visible. +2023-07-06: + Bjarl: + - balance: Static anomalies now deal more brain damage. + - balance: heartbeat anomalies now apply radiation burns to better telegraph their + hazard. + - rscadd: Most turrets now have a stun projectile + - rscadd: Turrets can now be repaired with a welder, and will report how damaged + they are when examined. + - rscdel: laser tag turrets. Rest in piss bozo. + - rscdel: Dwarves, Squidpeople + BogCreature: + - bugfix: The modcomp arcade minigame now properly gives gaming XP + 'Imaginos, Memed Hams ': + - soundadd: Borrows nsv's firealarm noise. + - soundadd: Borrows tg's printer noise. + - rscadd: Ports TG's Cannabis sprites. + - rscadd: Ports the old codersprite solars (I think they came from bay?) + - rscdel: The entire goon folder. + MarkSuckerberg: + - bugfix: Turffires should work again. + - tweak: Makes overmap movement and vox thermoregulators higher priority processing + targets + - rscadd: Colours in character creation are no longer crunched into three hex digits, + allowing for 16773120 new colours to use for mutcolour, haircolour, etcetera. + MothBlocks, MarkSuckerberg: + - rscadd: The rest of the autowiki system, as well as the vending machine and tech + node + Pawn, retlaw34: + - rscadd: Overmap consoles now have updated firmware, and as such have new sprites. + SapphicOverload: + - tweak: reinforced floors can no longer ignited by hotspots + ZephyrTFA: + - admin: Overmap Token Manager, use it. + goober3: + - tweak: Salvageable computers are now deconstructed into retro computer frames. + - tweak: Broken machinery can now be unwrenched. + - tweak: Destructive analyzers deconstruction messages have been tweaked to better + indicate laser intensity. + meemofcourse: + - tweak: Updated brain trauma messages + phoaly: + - tweak: tweaks the Hunter Montagne job outfit and job datum + - bugfix: 'Fixes #2101' + thgvr: + - bugfix: removes surgery table cloaking device +2023-07-07: + FlufflesTheDog: + - bugfix: Independent Litieguai's organ freezer now properly freezes the provided + organs + SapphicOverload: + - tweak: skeletons and plasmamen no longer husk, because they don't have flesh + - bugfix: fixed skeletons not having bones +2023-07-08: + Hibou48888: + - bugfix: big mortars now check the correct container for fullness before refusing + to fill said container + thgvr: + - rscadd: fucky wucky admin button +2023-07-10: + Bjarl: + - bugfix: Turrets properly report their integrity now + - bugfix: Assorted floating wall mounts and other oddities have been fixed, please + continue to report any you see. + MarkSuckerberg: + - bugfix: The wiki verb now works again + PositiveEntropy: + - imageadd: The Rack, Dresser and Holopad have been redone and updated! + SapphicOverload: + - tweak: tritium burn rate is based on oxygen-fuel ratio instead of being binary + fast/slow + - bugfix: fixed tritium fires breaking conservation of mass and consuming too much + oxygen + phoaly: + - bugfix: Fixes improperly declared outfits in ship jsons +2023-07-12: + Bjarl: + - rscadd: table mounted intercoms now exist + - rscadd: The Chronicle Class, a Real Solgov Ship, is now in game +2023-07-13: + PositiveEntropy: + - tweak: Changes the headsets that the SolGov captain, overseer, and representative + use into loudmode versions of their original incarnations! + - imageadd: Resprites shuttle chairs into way better versions in comparison to their + previous, non-license compliant versions! +2023-07-15: + Apogee-dev: + - tweak: Updated the Hyena with turret controls and visual updates + - balance: Rebalanced the Hyena's mining gear + PositiveEntropy: + - imageadd: Redoes a good majority of chairs! + Thgvr. Halcyon, Mark Suckerberg: + - rscadd: Adds new preferences to make characters fully prosthetic or a FBP (only + difference being brain type) + - rscadd: Lizard prosthetic/synthetic bodyparts with absolutely wonderful sprites + by Thgvr! It's just a visual difference, and any species can use them, + but they most resemble lizards, so. + - rscadd: Adds missing robotic vox bodyparts + - tweak: All species have the ability to change their two mutcolours. I don't think + this is really a loss at all. + thgvr: + - balance: Belts no longer fit in bags +2023-07-18: + Imaginos16: + - imageadd: Resprites the bobcurl haircut! + SapphicOverload: + - imageadd: updates some atmos sprites to fit in with the rest of engineering + retlaw34: + - rscadd: Solar armories and all related content + - balance: Bullets travel twice as fast now + - tweak: Bullets also glow in the dark now +2023-07-21: + tmtmtl30: + - bugfix: The roundstart join menu now correctly ignores playtime restrictions if + USE_EXP_TRACKING is disabled or no database is found. +2023-07-22: + Bjarl: + - rscadd: Planets now can (and will) play a sound when you land on them + - rscadd: Gas / Plasma giants, cold, dockable worlds with absolutely no livable + surfaces. As a matter of fact it's all chasm. All highly pressurized, gas rich, + chasm. + - rscadd: Dust storms and carp storms now grace the sector. + - rscadd: physical storms (dust, carp, asteroid), will now only trigger if you go + through them too fast. Take it easy and you might get through unscathed. + - rscadd: planets will now have a name on the overmap + - rscadd: overmap hazards now have a description + - tweak: Space carp can now survive in hyperspace, their natural habitat + - balance: minor and moderate electrical storms will no longer Explode you + - balance: asteroid storm lists have been trimmed of Extremely Deadly ones + - bugfix: restores planet naming behavior, I believe this was unintentionally removed + at some point + - bugfix: Ion storms work again. Fuck you whoever touched them last. + - soundadd: planet_landing_1 and planet_landing_2, (tech_notification and sos_morse_code + from CM respectively. I don't know how to attribute properly please tell me + how if you have issue with this attribution because I did not make these sounds + they're from Colonial Marines) + - imageadd: static and sparkler anomalies have "updated" icons + - rscadd: The Junker has another Mystery Safe + - rscadd: Ships can now start with varying amounts of money. + - rscadd: Ship access might work now + - bugfix: slurring + - balance: PKAs are now bulky + - rscadd: you can rotate door assemblies with alt-click + MarkSuckerberg: + - admin: Adds ticket claiming, interacting with a ticket will "claim" it and present + a warning to all other admins who try to interact also. + - bugfix: Pitch-black mutcolours are now randomised again + PositiveEntropy: + - balance: The Chronicle-class has been supplied with many new weapons fresh from + the solarian armory! + goober3: + - tweak: Large asteroids have been reworked into asteroid fields. + ritorizo: + - tweak: Mechanical surgery won't cancel at any wrong move. + thgvr: + - rscdel: You can no longer tend wounds with a pen + - balance: Ghetto surgery is less reliable across the board. + - balance: Organs will now decay in ~30 minutes, heart and brain in ~45 minutes. + - balance: Inducers now work for revival surgery. + - rscadd: Resprites underwear/socks/undershirts, adds a bunch of new ones, greyscales + some + - rscadd: Redesigns athletic shorts + - rscadd: Resprites the basic pants in loadouts + - rscadd: Hoodies, they're in loadouts. Couple colors selectable + - rscadd: Resprites organs, by Onule + - rscadd: Support for Kepori underwear/socks/undershirt + - rscdel: Some underwear/shirts were removed + - rscdel: Medical job alt outfits diff --git a/html/fuckywucky.png b/html/fuckywucky.png new file mode 100644 index 000000000000..74dd03a43955 Binary files /dev/null and b/html/fuckywucky.png differ diff --git a/icons/effects/anomalies.dmi b/icons/effects/anomalies.dmi new file mode 100644 index 000000000000..e1671b816ec5 Binary files /dev/null and b/icons/effects/anomalies.dmi differ diff --git a/icons/effects/blood_vox.dmi b/icons/effects/blood_vox.dmi new file mode 100644 index 000000000000..d6d8f1c80208 Binary files /dev/null and b/icons/effects/blood_vox.dmi differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index e83b46f343a9..f3dbe8bedb42 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/misc/overmap.dmi b/icons/misc/overmap.dmi index 613d98e2738e..f0c9f6e44677 100644 Binary files a/icons/misc/overmap.dmi and b/icons/misc/overmap.dmi differ diff --git a/icons/misc/overmap_large.dmi b/icons/misc/overmap_large.dmi index 9981b54e5d1a..ddb71228dfda 100644 Binary files a/icons/misc/overmap_large.dmi and b/icons/misc/overmap_large.dmi differ diff --git a/icons/misc/overmap_larger.dmi b/icons/misc/overmap_larger.dmi index 9287a7fab267..8870cf84a758 100644 Binary files a/icons/misc/overmap_larger.dmi and b/icons/misc/overmap_larger.dmi differ diff --git a/icons/mob/augmentation/augments_lizard.dmi b/icons/mob/augmentation/augments_lizard.dmi new file mode 100644 index 000000000000..9275462399d6 Binary files /dev/null and b/icons/mob/augmentation/augments_lizard.dmi differ diff --git a/icons/mob/augmentation/augments_vox.dmi b/icons/mob/augmentation/augments_vox.dmi index a837dba50ed7..5534adb59aed 100644 Binary files a/icons/mob/augmentation/augments_vox.dmi and b/icons/mob/augmentation/augments_vox.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 1f49cf97feb9..9393c996d538 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index 740f1335db43..02e39b1a0ae4 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 0b37fae2f3e2..159bad0a2910 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 4fc44cccf0f2..b046a32634fa 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi index 4ee800180dc5..18ae544a659d 100644 Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi index cd67ca626ca9..9be468cad241 100644 Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/mob/clothing/under/color.dmi b/icons/mob/clothing/under/color.dmi index a7238264b43c..8bda1f9c7d6c 100644 Binary files a/icons/mob/clothing/under/color.dmi and b/icons/mob/clothing/under/color.dmi differ diff --git a/icons/mob/clothing/under/masking_helpers.dmi b/icons/mob/clothing/under/masking_helpers.dmi deleted file mode 100644 index 134e0e4b50a0..000000000000 Binary files a/icons/mob/clothing/under/masking_helpers.dmi and /dev/null differ diff --git a/icons/mob/clothing/under/medical.dmi b/icons/mob/clothing/under/medical.dmi index ca492be6e7fa..f7fd1a137708 100644 Binary files a/icons/mob/clothing/under/medical.dmi and b/icons/mob/clothing/under/medical.dmi differ diff --git a/icons/mob/clothing/under/shorts_pants.dmi b/icons/mob/clothing/under/shorts_pants.dmi index 6c90e70c6747..4a5978b9f7f3 100644 Binary files a/icons/mob/clothing/under/shorts_pants.dmi and b/icons/mob/clothing/under/shorts_pants.dmi differ diff --git a/icons/mob/clothing/under/trackpants.dmi b/icons/mob/clothing/under/trackpants.dmi deleted file mode 100644 index ab1b63baca7e..000000000000 Binary files a/icons/mob/clothing/under/trackpants.dmi and /dev/null differ diff --git a/icons/mob/clothing/underwear.dmi b/icons/mob/clothing/underwear.dmi deleted file mode 100644 index 05334237ceb8..000000000000 Binary files a/icons/mob/clothing/underwear.dmi and /dev/null differ diff --git a/icons/mob/clothing/underwear/species/underwear_legs_kepori.dmi b/icons/mob/clothing/underwear/species/underwear_legs_kepori.dmi new file mode 100644 index 000000000000..aa9c16beb0ab Binary files /dev/null and b/icons/mob/clothing/underwear/species/underwear_legs_kepori.dmi differ diff --git a/icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi b/icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi new file mode 100644 index 000000000000..0f4fed39ebcb Binary files /dev/null and b/icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi differ diff --git a/icons/mob/clothing/underwear/species/underwear_torso_kepori.dmi b/icons/mob/clothing/underwear/species/underwear_torso_kepori.dmi new file mode 100644 index 000000000000..cdaa782b64d7 Binary files /dev/null and b/icons/mob/clothing/underwear/species/underwear_torso_kepori.dmi differ diff --git a/icons/mob/clothing/underwear/underwear_legs.dmi b/icons/mob/clothing/underwear/underwear_legs.dmi new file mode 100644 index 000000000000..7449094f5389 Binary files /dev/null and b/icons/mob/clothing/underwear/underwear_legs.dmi differ diff --git a/icons/mob/clothing/underwear/underwear_socks.dmi b/icons/mob/clothing/underwear/underwear_socks.dmi new file mode 100644 index 000000000000..bc7faddc5479 Binary files /dev/null and b/icons/mob/clothing/underwear/underwear_socks.dmi differ diff --git a/icons/mob/clothing/underwear/underwear_torso.dmi b/icons/mob/clothing/underwear/underwear_torso.dmi new file mode 100644 index 000000000000..5fa4ac787969 Binary files /dev/null and b/icons/mob/clothing/underwear/underwear_torso.dmi differ diff --git a/icons/mob/hair_extensions.dmi b/icons/mob/hair_extensions.dmi index af63e3b331c2..4e109e922697 100644 Binary files a/icons/mob/hair_extensions.dmi and b/icons/mob/hair_extensions.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 5d1499e366b8..bd508c89ebd0 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/inhands/misc/plushes_lefthand.dmi b/icons/mob/inhands/misc/plushes_lefthand.dmi new file mode 100644 index 000000000000..01fa1e7a2ed0 Binary files /dev/null and b/icons/mob/inhands/misc/plushes_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/plushes_righthand.dmi b/icons/mob/inhands/misc/plushes_righthand.dmi new file mode 100644 index 000000000000..99dd1d01044f Binary files /dev/null and b/icons/mob/inhands/misc/plushes_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_lefthand.dmi b/icons/mob/inhands/weapons/axes_lefthand.dmi index 164a4453b909..810455a611bd 100644 Binary files a/icons/mob/inhands/weapons/axes_lefthand.dmi and b/icons/mob/inhands/weapons/axes_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_righthand.dmi b/icons/mob/inhands/weapons/axes_righthand.dmi index 5ab5c7c9bebb..1f5273d20d30 100644 Binary files a/icons/mob/inhands/weapons/axes_righthand.dmi and b/icons/mob/inhands/weapons/axes_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 9c12ebb16a6c..ddbe6f328c2d 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index eb9b1107261b..df2aeb8caea3 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/mob/moth_markings.dmi b/icons/mob/moth_markings.dmi index 7f1798957d21..5bedf742444c 100644 Binary files a/icons/mob/moth_markings.dmi and b/icons/mob/moth_markings.dmi differ diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi index 3f9338ef4a34..41a801afb82f 100644 Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ diff --git a/icons/mob/species/lizard/bodyparts.dmi b/icons/mob/species/lizard/bodyparts.dmi index 6eadfa27a509..69d3c24b580f 100644 Binary files a/icons/mob/species/lizard/bodyparts.dmi and b/icons/mob/species/lizard/bodyparts.dmi differ diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi index 31c79558efa7..5ad8a47ceb9b 100644 Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ diff --git a/icons/mob/species/vox/bodyparts.dmi b/icons/mob/species/vox/bodyparts.dmi index 8f629f8732ae..fb098fa01d80 100644 Binary files a/icons/mob/species/vox/bodyparts.dmi and b/icons/mob/species/vox/bodyparts.dmi differ diff --git a/icons/mob/species/vox/onmob_back_vox.dmi b/icons/mob/species/vox/onmob_back_vox.dmi index 7aeb57d79412..f7d7499b6cc5 100644 Binary files a/icons/mob/species/vox/onmob_back_vox.dmi and b/icons/mob/species/vox/onmob_back_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_belt_vox.dmi b/icons/mob/species/vox/onmob_belt_vox.dmi new file mode 100644 index 000000000000..9d183ea045b4 Binary files /dev/null and b/icons/mob/species/vox/onmob_belt_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_ears_vox.dmi b/icons/mob/species/vox/onmob_ears_vox.dmi index 6c7d5e4d453c..f99cebc84afc 100644 Binary files a/icons/mob/species/vox/onmob_ears_vox.dmi and b/icons/mob/species/vox/onmob_ears_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_eyes_vox.dmi b/icons/mob/species/vox/onmob_eyes_vox.dmi new file mode 100644 index 000000000000..2a30fe355bf1 Binary files /dev/null and b/icons/mob/species/vox/onmob_eyes_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_feet_vox.dmi b/icons/mob/species/vox/onmob_feet_vox.dmi new file mode 100644 index 000000000000..5b8f970697eb Binary files /dev/null and b/icons/mob/species/vox/onmob_feet_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_hands_vox.dmi b/icons/mob/species/vox/onmob_hands_vox.dmi new file mode 100644 index 000000000000..e1527c62b702 Binary files /dev/null and b/icons/mob/species/vox/onmob_hands_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_head_vox.dmi b/icons/mob/species/vox/onmob_head_vox.dmi index 13dcbe1b27ae..d6b498ca0b5e 100644 Binary files a/icons/mob/species/vox/onmob_head_vox.dmi and b/icons/mob/species/vox/onmob_head_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_mask_vox.dmi b/icons/mob/species/vox/onmob_mask_vox.dmi index c101317505b8..b460caedb721 100644 Binary files a/icons/mob/species/vox/onmob_mask_vox.dmi and b/icons/mob/species/vox/onmob_mask_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_suit_vox.dmi b/icons/mob/species/vox/onmob_suit_vox.dmi index b64b0163b582..298f46032ab1 100644 Binary files a/icons/mob/species/vox/onmob_suit_vox.dmi and b/icons/mob/species/vox/onmob_suit_vox.dmi differ diff --git a/icons/mob/species/vox/onmob_uniform_vox.dmi b/icons/mob/species/vox/onmob_uniform_vox.dmi index acac098a4034..334e6a3d1705 100644 Binary files a/icons/mob/species/vox/onmob_uniform_vox.dmi and b/icons/mob/species/vox/onmob_uniform_vox.dmi differ diff --git a/icons/mob/species/vox/vox_quills.dmi b/icons/mob/species/vox/vox_quills.dmi index bd3042fa9ef0..41468992361c 100644 Binary files a/icons/mob/species/vox/vox_quills.dmi and b/icons/mob/species/vox/vox_quills.dmi differ diff --git a/icons/obj/Chem_jug.dmi b/icons/obj/Chem_jug.dmi new file mode 100644 index 000000000000..d872ba00ff1d Binary files /dev/null and b/icons/obj/Chem_jug.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index e9caef955c2d..0634a3d3ee3c 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi index adb0b69c590a..12f4a068582b 100644 Binary files a/icons/obj/assemblies/new_assemblies.dmi and b/icons/obj/assemblies/new_assemblies.dmi differ diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index 9ac29ff97c41..94df693238d0 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 648cb48e8660..19b49a6d34da 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index bf88f41a0742..91c6c8fafec5 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 1019b682a540..78c5a1fb815c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi index 7c3fd301a0cc..5ced5746e4b7 100644 Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi index 47143f498b1d..8eb73408fe09 100644 Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ diff --git a/icons/obj/clothing/under/medical.dmi b/icons/obj/clothing/under/medical.dmi index 0b494151455d..47504e0eae56 100644 Binary files a/icons/obj/clothing/under/medical.dmi and b/icons/obj/clothing/under/medical.dmi differ diff --git a/icons/obj/clothing/under/shorts_pants.dmi b/icons/obj/clothing/under/shorts_pants.dmi index ae010c4578bd..948fc01d4c83 100644 Binary files a/icons/obj/clothing/under/shorts_pants.dmi and b/icons/obj/clothing/under/shorts_pants.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index b2d5beaa2c6c..89c576fb6069 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi index b146d5a75364..153d53c6e285 100644 Binary files a/icons/obj/crates.dmi and b/icons/obj/crates.dmi differ diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi index cd6e46114788..c47097987e87 100644 Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 40d3d0dadc42..24b209d6ab2b 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index e7b0942301de..2d8aecc78695 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 5959fec80530..aeae4b17a44e 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 383c7b0af8b1..56246df09ad9 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/machines/oldsolars.dmi b/icons/obj/machines/oldsolars.dmi new file mode 100644 index 000000000000..6bf300b6718e Binary files /dev/null and b/icons/obj/machines/oldsolars.dmi differ diff --git a/icons/obj/meteor.dmi b/icons/obj/meteor.dmi index 84faabcc1881..3e37c229ec93 100644 Binary files a/icons/obj/meteor.dmi and b/icons/obj/meteor.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index d3cb9177384d..256b616cd852 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 5fe7b58d796e..8d1f4993e770 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index f80bd9e83425..e58811689631 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index effae3624752..5ccb6bb1d792 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 776297d417a2..d57c25c097d5 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index b662141b0c0a..1fa68293cd4a 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/icons/obj/surgery_table.dmi b/icons/obj/surgery_table.dmi new file mode 100644 index 000000000000..ed0f02bf517b Binary files /dev/null and b/icons/obj/surgery_table.dmi differ diff --git a/icons/obj/vox_items.dmi b/icons/obj/vox_items.dmi deleted file mode 100644 index d9c671093d03..000000000000 Binary files a/icons/obj/vox_items.dmi and /dev/null differ diff --git a/icons/obj/wallmounts.dmi b/icons/obj/wallmounts.dmi index d2dfa76e78ea..96e0c28e715c 100644 Binary files a/icons/obj/wallmounts.dmi and b/icons/obj/wallmounts.dmi differ diff --git a/icons/turf/overmap.dmi b/icons/turf/overmap.dmi index 2645ff809343..e09af9abe3ee 100644 Binary files a/icons/turf/overmap.dmi and b/icons/turf/overmap.dmi differ diff --git a/interface/interface.dm b/interface/interface.dm index c753146f7972..e92c1cac13f1 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -6,7 +6,7 @@ var/wikiurl = CONFIG_GET(string/wikiurl) if(wikiurl) if(query) - var/output = wikiurl + "/index.php?title=Special%3ASearch&profile=default&search=" + query + var/output = "[wikiurl]?title=Special%3ASearch&profile=default&search=[query]" src << link(output) else if (query != null) src << link(wikiurl) diff --git a/interface/skin.dmf b/interface/skin.dmf index d355081fa416..72e535bf7197 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -250,9 +250,8 @@ window "outputwindow" size = 517x20 anchor1 = 0,100 anchor2 = 100,100 - background-color = #d3b5b5 is-default = true - border = sunken + border = line saved-params = "command" elem "saybutton" type = BUTTON diff --git a/shiptest.dme b/shiptest.dme index 33368b7d0218..dfeb323f63c6 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -25,6 +25,7 @@ #include "code\__DEFINES\access.dm" #include "code\__DEFINES\achievements.dm" #include "code\__DEFINES\admin.dm" +#include "code\__DEFINES\anomalies.dm" #include "code\__DEFINES\antagonists.dm" #include "code\__DEFINES\aquarium.dm" #include "code\__DEFINES\atmospherics.dm" @@ -32,6 +33,7 @@ #include "code\__DEFINES\bitfields.dm" #include "code\__DEFINES\blackmarket.dm" #include "code\__DEFINES\bodyparts.dm" +#include "code\__DEFINES\bone_flags.dm" #include "code\__DEFINES\botany.dm" #include "code\__DEFINES\callbacks.dm" #include "code\__DEFINES\cargo.dm" @@ -142,17 +144,6 @@ #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\signals.dm" -#include "code\__DEFINES\whitesands_after_defines\icon_smoothing.dm" -#include "code\__DEFINES\~whitesands_defines\_defines.dm" -#include "code\__DEFINES\~whitesands_defines\atmospherics.dm" -#include "code\__DEFINES\~whitesands_defines\bone_flags.dm" -#include "code\__DEFINES\~whitesands_defines\jobs.dm" -#include "code\__DEFINES\~whitesands_defines\machines.dm" -#include "code\__DEFINES\~whitesands_defines\maths.dm" -#include "code\__DEFINES\~whitesands_defines\movespeed_modification.dm" -#include "code\__DEFINES\~whitesands_defines\shuttles.dm" -#include "code\__DEFINES\~whitesands_defines\status_effects.dm" -#include "code\__DEFINES\~whitesands_defines\traits.dm" #include "code\__HELPERS\_extools_api.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_logging.dm" @@ -335,6 +326,7 @@ #include "code\controllers\subsystem\npcpool.dm" #include "code\controllers\subsystem\overlays.dm" #include "code\controllers\subsystem\overmap.dm" +#include "code\controllers\subsystem\overmap_move.dm" #include "code\controllers\subsystem\pai.dm" #include "code\controllers\subsystem\parallax.dm" #include "code\controllers\subsystem\pathfinder.dm" @@ -350,6 +342,7 @@ #include "code\controllers\subsystem\server_maint.dm" #include "code\controllers\subsystem\shuttle.dm" #include "code\controllers\subsystem\skills.dm" +#include "code\controllers\subsystem\sound_loops.dm" #include "code\controllers\subsystem\sounds.dm" #include "code\controllers\subsystem\spacedrift.dm" #include "code\controllers\subsystem\speech_controller.dm" @@ -415,7 +408,6 @@ #include "code\datums\progressbar.dm" #include "code\datums\quixotejump.dm" #include "code\datums\radiation_wave.dm" -#include "code\datums\recipe.dm" #include "code\datums\ruins.dm" #include "code\datums\saymode.dm" #include "code\datums\shuttles.dm" @@ -446,6 +438,7 @@ #include "code\datums\brain_damage\special.dm" #include "code\datums\brain_damage\split_personality.dm" #include "code\datums\components\_component.dm" +#include "code\datums\components\admin_popup.dm" #include "code\datums\components\anti_magic.dm" #include "code\datums\components\armor_plate.dm" #include "code\datums\components\art.dm" @@ -663,6 +656,7 @@ #include "code\datums\mapgen\SingleTurf.dm" #include "code\datums\mapgen\Whitesandsatmos.dm" #include "code\datums\mapgen\planetary\_PlanetGenerator.dm" +#include "code\datums\mapgen\planetary\AsteroidGenerator.dm" #include "code\datums\mapgen\planetary\BeachGenerator.dm" #include "code\datums\mapgen\planetary\JungleGenerator.dm" #include "code\datums\mapgen\planetary\LavaGenerator.dm" @@ -671,7 +665,7 @@ #include "code\datums\mapgen\planetary\SnowGenerator.dm" #include "code\datums\mapgen\planetary\WasteGenerator.dm" #include "code\datums\mapgen\single_biome\_SingleBiome.dm" -#include "code\datums\mapgen\single_biome\AsteroidCaves.dm" +#include "code\datums\mapgen\single_biome\Gas_Giant.dm" #include "code\datums\mapgen\single_biome\ReebeGenerator.dm" #include "code\datums\martial\_martial.dm" #include "code\datums\martial\boxing.dm" @@ -968,6 +962,7 @@ #include "code\game\machinery\telecomms\machines\receiver.dm" #include "code\game\machinery\telecomms\machines\relay.dm" #include "code\game\machinery\telecomms\machines\server.dm" +#include "code\game\MapData\shuttles\misc.dm" #include "code\game\MapData\shuttles\nanotrasen_mimir.dm" #include "code\game\MapData\shuttles\nanotrasen_powerrangers.dm" #include "code\game\MapData\shuttles\srm_glaive.dm" @@ -1008,7 +1003,6 @@ #include "code\game\objects\objs.dm" #include "code\game\objects\structures.dm" #include "code\game\objects\effects\alien_acid.dm" -#include "code\game\objects\effects\anomalies.dm" #include "code\game\objects\effects\blessing.dm" #include "code\game\objects\effects\bump_teleporter.dm" #include "code\game\objects\effects\contraband.dm" @@ -1029,6 +1023,21 @@ #include "code\game\objects\effects\step_triggers.dm" #include "code\game\objects\effects\turf_fire.dm" #include "code\game\objects\effects\wanted_poster.dm" +#include "code\game\objects\effects\anomalies\_anomalies.dm" +#include "code\game\objects\effects\anomalies\anomalies_bluespace.dm" +#include "code\game\objects\effects\anomalies\anomalies_flux.dm" +#include "code\game\objects\effects\anomalies\anomalies_gravity.dm" +#include "code\game\objects\effects\anomalies\anomalies_hallucination.dm" +#include "code\game\objects\effects\anomalies\anomalies_heartbeat.dm" +#include "code\game\objects\effects\anomalies\anomalies_melter.dm" +#include "code\game\objects\effects\anomalies\anomalies_phantom.dm" +#include "code\game\objects\effects\anomalies\anomalies_plasmasoul.dm" +#include "code\game\objects\effects\anomalies\anomalies_pulsar.dm" +#include "code\game\objects\effects\anomalies\anomalies_pyroclastic.dm" +#include "code\game\objects\effects\anomalies\anomalies_sparkler.dm" +#include "code\game\objects\effects\anomalies\anomalies_static.dm" +#include "code\game\objects\effects\anomalies\anomalies_veins.dm" +#include "code\game\objects\effects\anomalies\anomalies_vortex.dm" #include "code\game\objects\effects\decals\cleanable.dm" #include "code\game\objects\effects\decals\crayon.dm" #include "code\game\objects\effects\decals\decal.dm" @@ -1104,7 +1113,6 @@ #include "code\game\objects\items\dyekit.dm" #include "code\game\objects\items\eightball.dm" #include "code\game\objects\items\energyhalberd.dm" -#include "code\game\objects\items\environmental_regulator.dm" #include "code\game\objects\items\etherealdiscoball.dm" #include "code\game\objects\items\extinguisher.dm" #include "code\game\objects\items\fireaxe.dm" @@ -1500,6 +1508,7 @@ #include "code\modules\admin\verbs\mapping.dm" #include "code\modules\admin\verbs\mentors_edit.dm" #include "code\modules\admin\verbs\one_click_antag.dm" +#include "code\modules\admin\verbs\overmap_token_manager.dm" #include "code\modules\admin\verbs\panicbunker.dm" #include "code\modules\admin\verbs\playsound.dm" #include "code\modules\admin\verbs\possess.dm" @@ -1512,6 +1521,7 @@ #include "code\modules\admin\verbs\selectequipment.dm" #include "code\modules\admin\verbs\shuttlepanel.dm" #include "code\modules\admin\verbs\spawnobjasmob.dm" +#include "code\modules\admin\verbs\toggle_ship_spawn.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_wrappers.dm" @@ -1772,6 +1782,12 @@ #include "code\modules\atmospherics\machinery\portable\portable_atmospherics.dm" #include "code\modules\atmospherics\machinery\portable\pump.dm" #include "code\modules\atmospherics\machinery\portable\scrubber.dm" +#include "code\modules\autowiki\autowiki.dm" +#include "code\modules\autowiki\pages\base.dm" +#include "code\modules\autowiki\pages\reagents.dm" +#include "code\modules\autowiki\pages\ships.dm" +#include "code\modules\autowiki\pages\techweb.dm" +#include "code\modules\autowiki\pages\vending.dm" #include "code\modules\awaymissions\away_props.dm" #include "code\modules\awaymissions\bluespaceartillery.dm" #include "code\modules\awaymissions\capture_the_flag.dm" @@ -1855,6 +1871,7 @@ #include "code\modules\cargo\packs\ammo.dm" #include "code\modules\cargo\packs\animal.dm" #include "code\modules\cargo\packs\canister.dm" +#include "code\modules\cargo\packs\chemistry.dm" #include "code\modules\cargo\packs\civilian.dm" #include "code\modules\cargo\packs\costumes_toys.dm" #include "code\modules\cargo\packs\emergency.dm" @@ -1943,6 +1960,7 @@ #include "code\modules\clothing\suits\bio.dm" #include "code\modules\clothing\suits\chaplainsuits.dm" #include "code\modules\clothing\suits\cloaks.dm" +#include "code\modules\clothing\suits\hoodies.dm" #include "code\modules\clothing\suits\jobs.dm" #include "code\modules\clothing\suits\labcoat.dm" #include "code\modules\clothing\suits\miscellaneous.dm" @@ -1997,12 +2015,6 @@ #include "code\modules\events\_event.dm" #include "code\modules\events\abductor.dm" #include "code\modules\events\alien_infestation.dm" -#include "code\modules\events\anomaly.dm" -#include "code\modules\events\anomaly_bluespace.dm" -#include "code\modules\events\anomaly_flux.dm" -#include "code\modules\events\anomaly_grav.dm" -#include "code\modules\events\anomaly_pyro.dm" -#include "code\modules\events\anomaly_vortex.dm" #include "code\modules\events\aurora_caelus.dm" #include "code\modules\events\blob.dm" #include "code\modules\events\borers.dm" @@ -2276,7 +2288,6 @@ #include "code\modules\language\common.dm" #include "code\modules\language\draconic.dm" #include "code\modules\language\drone.dm" -#include "code\modules\language\dwarven.dm" #include "code\modules\language\language.dm" #include "code\modules\language\language_holder.dm" #include "code\modules\language\language_menu.dm" @@ -2288,7 +2299,6 @@ #include "code\modules\language\narsian.dm" #include "code\modules\language\piratespeak.dm" #include "code\modules\language\ratvarian.dm" -#include "code\modules\language\rylethian.dm" #include "code\modules\language\shadowtongue.dm" #include "code\modules\language\slime.dm" #include "code\modules\language\spider.dm" @@ -2384,7 +2394,22 @@ #include "code\modules\mob\dead\new_player\poll.dm" #include "code\modules\mob\dead\new_player\preferences_setup.dm" #include "code\modules\mob\dead\new_player\ship_select.dm" -#include "code\modules\mob\dead\new_player\sprite_accessories.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\_sprite_accessories.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\ears.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\elzuose.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\facial_hair.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\hair.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\ipc.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\kepori.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\lizard.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\moth.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\rachnid.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\tails.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\vox.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\wings.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\underwear\underwear_legs.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\underwear\underwear_socks.dm" +#include "code\modules\mob\dead\new_player\sprite_accessories\underwear\underwear_torso.dm" #include "code\modules\mob\dead\observer\login.dm" #include "code\modules\mob\dead\observer\logout.dm" #include "code\modules\mob\dead\observer\notificationprefs.dm" @@ -2470,6 +2495,7 @@ #include "code\modules\mob\living\carbon\hologram\em_holopads.dm" #include "code\modules\mob\living\carbon\hologram\hologram.dm" #include "code\modules\mob\living\carbon\hologram\hologram_inventory.dm" +#include "code\modules\mob\living\carbon\human\consistent_human.dm" #include "code\modules\mob\living\carbon\human\damage_procs.dm" #include "code\modules\mob\living\carbon\human\death.dm" #include "code\modules\mob\living\carbon\human\dummy.dm" @@ -2491,7 +2517,6 @@ #include "code\modules\mob\living\carbon\human\species_types\abductors.dm" #include "code\modules\mob\living\carbon\human\species_types\android.dm" #include "code\modules\mob\living\carbon\human\species_types\dullahan.dm" -#include "code\modules\mob\living\carbon\human\species_types\dwarves.dm" #include "code\modules\mob\living\carbon\human\species_types\ethereal.dm" #include "code\modules\mob\living\carbon\human\species_types\flypeople.dm" #include "code\modules\mob\living\carbon\human\species_types\golems.dm" @@ -2508,7 +2533,6 @@ #include "code\modules\mob\living\carbon\human\species_types\skeletons.dm" #include "code\modules\mob\living\carbon\human\species_types\snail.dm" #include "code\modules\mob\living\carbon\human\species_types\spider.dm" -#include "code\modules\mob\living\carbon\human\species_types\squidpeople.dm" #include "code\modules\mob\living\carbon\human\species_types\vampire.dm" #include "code\modules\mob\living\carbon\human\species_types\vox.dm" #include "code\modules\mob\living\carbon\human\species_types\zombies.dm" @@ -2937,6 +2961,7 @@ #include "code\modules\projectiles\boxes_magazines\internal\_cylinder.dm" #include "code\modules\projectiles\boxes_magazines\internal\_internal.dm" #include "code\modules\projectiles\boxes_magazines\internal\derringer.dm" +#include "code\modules\projectiles\boxes_magazines\internal\gauss.dm" #include "code\modules\projectiles\boxes_magazines\internal\grenade.dm" #include "code\modules\projectiles\boxes_magazines\internal\misc.dm" #include "code\modules\projectiles\boxes_magazines\internal\revolver.dm" @@ -2992,6 +3017,7 @@ #include "code\modules\projectiles\projectile\bullets\smg.dm" #include "code\modules\projectiles\projectile\bullets\sniper.dm" #include "code\modules\projectiles\projectile\bullets\special.dm" +#include "code\modules\projectiles\projectile\bullets\turret.dm" #include "code\modules\projectiles\projectile\energy\_energy.dm" #include "code\modules\projectiles\projectile\energy\ebow.dm" #include "code\modules\projectiles\projectile\energy\misc.dm" @@ -3054,6 +3080,7 @@ #include "code\modules\reagents\reagent_containers\glass.dm" #include "code\modules\reagents\reagent_containers\hypospray.dm" #include "code\modules\reagents\reagent_containers\hypovial.dm" +#include "code\modules\reagents\reagent_containers\jug.dm" #include "code\modules\reagents\reagent_containers\maunamug.dm" #include "code\modules\reagents\reagent_containers\medigel.dm" #include "code\modules\reagents\reagent_containers\mortar.dm" diff --git a/sound/effects/planet_landing_1.ogg b/sound/effects/planet_landing_1.ogg new file mode 100644 index 000000000000..1581c1f9955a Binary files /dev/null and b/sound/effects/planet_landing_1.ogg differ diff --git a/sound/effects/planet_landing_2.ogg b/sound/effects/planet_landing_2.ogg new file mode 100644 index 000000000000..bd206161173c Binary files /dev/null and b/sound/effects/planet_landing_2.ogg differ diff --git a/sound/health/fastbeat2.ogg b/sound/health/fastbeat2.ogg new file mode 100644 index 000000000000..93f26c2195b8 Binary files /dev/null and b/sound/health/fastbeat2.ogg differ diff --git a/sound/health/slowbeat2.ogg b/sound/health/slowbeat2.ogg new file mode 100644 index 000000000000..91143884aea9 Binary files /dev/null and b/sound/health/slowbeat2.ogg differ diff --git a/sound/machines/FireAlarm.ogg b/sound/machines/FireAlarm.ogg new file mode 100644 index 000000000000..aa651b436138 Binary files /dev/null and b/sound/machines/FireAlarm.ogg differ diff --git a/sound/machines/printer.ogg b/sound/machines/printer.ogg new file mode 100644 index 000000000000..6916a695bf57 Binary files /dev/null and b/sound/machines/printer.ogg differ diff --git a/sound/misc/asay_ping.ogg b/sound/misc/asay_ping.ogg new file mode 100644 index 000000000000..ed293db4fd32 Binary files /dev/null and b/sound/misc/asay_ping.ogg differ diff --git a/sound/misc/fuckywucky.ogg b/sound/misc/fuckywucky.ogg new file mode 100644 index 000000000000..5d694149dc82 Binary files /dev/null and b/sound/misc/fuckywucky.ogg differ diff --git a/sound/voice/lizard/squeal.ogg b/sound/voice/lizard/squeal.ogg new file mode 100644 index 000000000000..f4624376e2b7 Binary files /dev/null and b/sound/voice/lizard/squeal.ogg differ diff --git a/sound/voice/lizard/tailthump.ogg b/sound/voice/lizard/tailthump.ogg new file mode 100644 index 000000000000..e4bf25f7b8d1 Binary files /dev/null and b/sound/voice/lizard/tailthump.ogg differ diff --git a/sound/weapons/gun/gauss/claris.ogg b/sound/weapons/gun/gauss/claris.ogg new file mode 100644 index 000000000000..38699df272b9 Binary files /dev/null and b/sound/weapons/gun/gauss/claris.ogg differ diff --git a/sound/weapons/gun/gauss/gar.ogg b/sound/weapons/gun/gauss/gar.ogg new file mode 100644 index 000000000000..fc3e2a7aa66d Binary files /dev/null and b/sound/weapons/gun/gauss/gar.ogg differ diff --git a/sound/weapons/gun/gauss/modelh.ogg b/sound/weapons/gun/gauss/modelh.ogg new file mode 100644 index 000000000000..4a7f558b31f3 Binary files /dev/null and b/sound/weapons/gun/gauss/modelh.ogg differ diff --git a/sound/weapons/gun/general/rocket_launch.ogg b/sound/weapons/gun/general/rocket_launch.ogg index fe9d86a47fcb..74d7e649de9d 100644 Binary files a/sound/weapons/gun/general/rocket_launch.ogg and b/sound/weapons/gun/general/rocket_launch.ogg differ diff --git a/sound/weapons/gun/pistol/pistolec.ogg b/sound/weapons/gun/pistol/pistolec.ogg new file mode 100644 index 000000000000..f908a277a0b7 Binary files /dev/null and b/sound/weapons/gun/pistol/pistolec.ogg differ diff --git a/strings/names/dwarf_first.txt b/strings/names/dwarf_first.txt deleted file mode 100644 index b71ccc2d6eb4..000000000000 --- a/strings/names/dwarf_first.txt +++ /dev/null @@ -1,84 +0,0 @@ -Thizuil -Nemdout -Nursan -Grimm -Kaschei -Khelben -Hosdrum -Sarbarra -Mystryl -Nihilus -Palando -Prospero -Radagast -Saruman -Tenser -Terefi -Gotdrilyn -Vaarsuvius -Zagyg -Urist -Matgrous -Kissaet -Magni -Modi -Freyja -Muradin -Baldr -Loki -Hel -Thor -Odin -Fenrir -Bjorn -Elrik -Erik -Harald -Sven -Arnwe -Ulf -Sif -Astrid -Bodil -Helga -Ulfhild -Sigrid -Alva -Asmund -Astrid -Brenna -Finn -Eerika -Einar -Geir -Gunhild -Haskell -Helka -Ingvar -Leif -Olaf -Olga -Raoul -Thrya -Tobjorn -Tyr -Vidar -Ylva -Freyr -Mimir -Eoghan -Cormac -Fionn -Fergus -Flann -Conn -Brigit -Graine -Cadoc -Caelfind -Ciaran -Enna -Fiacha -Myrm -Ingol -Arns diff --git a/strings/names/dwarf_last.txt b/strings/names/dwarf_last.txt deleted file mode 100644 index 84398cf3c06a..000000000000 --- a/strings/names/dwarf_last.txt +++ /dev/null @@ -1,58 +0,0 @@ -Brightjaw -Steelbrew -Grimtank -Mudback -Brickbane -Stormbrow -Deephelm -Earthpike -Berylshield -Ashbearer -Fullcask -Flintgrip -Thundermaw -Cragborg -Jadearm -Hornbelt -Fierygranite -Leadforge -Kragthane -Oakenaxe -Beastback -Coinbender -Bronzejaw -Barreldancer -Grumblesphere -Graybane -Flattoe -Steelmaker -Bronzebeard -Kragcloak -Magmaborn -Gravelbasher -Whitbrew -McUrist -Mountaincoat -Chaosbane -Darksunder -Bronzebeard -Orebreaker -Jotunsfoe -Swordmender -Emirsson -Arnsdottr -Jorgensson -Mirsdottr -Haraldsson -Sveinsdottr -Jonsdottr -Auolsson -Ingoldottr -Myrmsson -Finnsdottr -Ennsdottr -Fialsson -Flannsdottr -Ylvasson -Tyrsson -Odinsson diff --git a/strings/traumas.json b/strings/traumas.json index 14fccd286084..f6bd9b589553 100644 --- a/strings/traumas.json +++ b/strings/traumas.json @@ -3,7 +3,6 @@ "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "@pick(semicolon)CAPTAINS A COMDOM", - "@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!", "can u give me @pick(mutations)?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", @@ -13,59 +12,102 @@ "shiggey diggey!!", "@pick(semicolon)A PIRATE APPEAR", "FUS RO DAH", - "fucking 4rries!", "stat me", ">my face", "roll it easy!", - "waaaaaagh!!!", - "red wonz go fasta", - "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", - "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!", "port ba@pick(y_replacements) med!!!!", - "REVIRT COBY CHEM!!!!!!!!", "youed call her a toeugh bithc", "closd for merbegging", "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???", "GEY AWAY FROM ME U GREIFING PRICK!!!!", - "ur a fuckeing autist!", - "@pick(semicolon)HELP SHITECIRTY MURDERIN MEE!!!", + "@pick(semicolon)HELP INTEG MURDERIN MEE!!!", "hwat dose tha @pick(random_gibberish) mean?????", - "@pick(semicolon)CAL; TEH SHUTTLE!!!!!", + "@pick(semicolon)DO A BLUP SPEaS JUMP!!!!!", "wearnig siNGUARLTY is.... FINE haHAAA", "@pick(semicolon)AI laW 22 Open door", - "@pick(semicolon)this SI mY stATIon......", + "@pick(semicolon)this SI mY sHip......", "who the HELL do u thenk u r?!!!!", "geT THE FUCK OUTTTT", - "H U G B O X", - "@pick(semicolon)CRASHING THIS STTAYTION WITH NIO SURVIVROS", - "@pick(servers) is down!! @pick(bug)", + "@pick(semicolon)CRASHING THIS SHIMP WITH NIO SURVIVROS", "PSHOOOM", "REMOVE SINGULARITY", "INSTLL TEG", "TURBIN IS BEST ENGIENE", "SOLIRS CAN POWER THE HOLE FLEEHT ANEWAY @pick(bug)", "parasteng was best", - "@pick(semicolon)Tajaran has warrrres, if you have coin", "@pick(semicolon)I'VE GOT BALLS OF STEEL", "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE", "i will snatch erry motherfucker birthday", - "@pick(semicolon)the ai and borgs are mettacomming I think", "u just did the world a little bit more sad place for someone", - "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?", "@pick(semicolon)N-NYAAAAAA~", "@pick(bug)", "@pick(semicolon)wtf??????????? @pick(bug)", "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)", "DON'T EVER TUCH ME", - "@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS", - "its gonna be like 9/11 all over again but insitaead is gonna be a bitc", - "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????" + "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????", + "AMOGN US IS FUNNY!!", + "DID YOU FUCKING.", + "i DEMAND!!! APOGEE-DEV BE DEOMTED!!!", + "@pick(semicolon)I don't ndED tEARPAHY.", + "@pick(semicolon)an,d CIOCK.", + "TUWN ME INoT A CAT!!", + "WHY WAES THE PEILL REMOVED???", + "work on the wiki please", + "ahelp SPAWN @pick(aspawnships) PLS", + "Am i allowd to kil l people if thye piss me off", + "IS THIS LIEK VOIDCREW???", + "UNiT PANICKING.", + "HIII!! HI!! <3 <3 <3", + "I LOOK LKIE BEAN,S,,, CRINGE!!!", + "SEET TH shIP TO kOS!!!!!", + "IM SynDCIATe, I ANTag, I CAN KOS......", + "ahelp ADMIN CAN I BE PIRTA", + "DOCTOR YUO DO DISCETIONS!!!", + "RESERCH NANIYES", + "REVSRSE A NY WALLS!!!", + "*monch", + "Amonger", + "Live mas", + "top ten goliath funny moments", + "put me... in a stew... then buryy mee...", + "@pick(semicolon)GTT AWYA FROM HER YOU BITHC!!", + "@pick(semicolon)IS TATH A FUCKIGN,, MOTH.", + "@pick(semicolon)BRAZIL NUMEOR UNO...!!!!", + "@pick(semicolon)blbue hair??? I'M GOIgN TO KILL THDT FUIKNG COW!", + "@pick(semicolon)HOW DO I @pick(ghetto)?????", + "ough", + "ourgh", + "ouughghnnnn", + "hrrnggg", + "HE IS BALD!!!", + "I AM NORMAL. I CAN BE TRUSTED WITH INDUSTRIAL CHEMICALS", + "Welcome to the bathroom", + "THE AMOUNGS BROKE ALL MY BONES", + "HOLY SHIT IT'S @pick(john) @pick(factions)!!", + "BLrobo BLEEBUS.....", + "drugs are funny because they add new rp elements", + "ANOTHER SHIP... STERALIZED...", + "HOpeLes WAsN'T ALwAYS NaMeD HoPelESs BeFORE THe incIDENST...", + "@pick(semicolon)HopeLSS WAS ACTUAL. Ly a LIVIng WaePON....", + "@pick(semicolon)WHEN SHIPQUEST????? PANEL NEW??????", + "WHER.E SHIPQUEST???,???", + "ei,,ither wAy... It Is WHt ti is", + "butT ShIPPtSt nEVER was a WrAZnOe liKE thaEt!!", + "A deEoP-setED dISEuire... fuR pERfECTiOsM...", + "HUMORER IS A DECLIAT THINGE!!", + "who's the asshole flying the pill class", + "IVOR@pick(y_replacements) WHAT THE FOUCKE ARE U DUING!!!??", + "RESIEST BIG MOETH", + "WE MUSTE RIASE UOP AGANST BEEG MOTNH", + "Luckily, I passed high school physics", + "I WANT NOTHING MORE IN THIS LIFE THAN TO CUDDLE UP WITH A CUTE MOTH WAIFU!!", + "GO TO HORNY JAIL!!" ], "mutations": [ @@ -79,24 +121,14 @@ "stun gloves" ], - "george": ["joerge", "george", "gorge", "gdoruge"], + "john": ["joehn", "jonn", "jouhn", "jeeoun"], + + "factions": ["SYNDICT", "NATOSASEN", "EEMTEQ", "MIENUTMEN", "SOMLGOVM"], - "mellens": ["mellens", "melons", "mwrlins"], "random_gibberish": ["g", "squid", "r", "carbon dioxide"], "y_replacements": ["y", "i", "e"], - "servers": [ - "bager", - "sybl", - "mrs sybil", - "mr basil", - "mr terry", - "berry", - "vent hell", - "colonel hall" - ], - "create_verbs": ["spawn", "MAke me", "creat", "tc trade me", "gib"], "create_nouns": [ @@ -113,10 +145,25 @@ "anteg" ], + "aspawnships": [ + "BUblBUE", + "RoUBE", + "PeEL", + "TWInkLRE", + "MAYONEISE", + "raEDIO", + "joUPITR", + "HAELR TROCK", + "BEYOO", + "TID" + ], + "bug": ["", "IS TIS A BUG??", "SI IST A BUGG/", "BUG!!!"], "semicolon": ["", ";", ".h"], + "ghetto": ["ghetcheom", "ghettoghemc", "gahttochem"], + "god_foe": [ "MORTALS", "HERETICS", diff --git a/tgui/.prettierrc.yml b/tgui/.prettierrc.yml index 2c3eacf0f273..6d51c23ecf02 100644 --- a/tgui/.prettierrc.yml +++ b/tgui/.prettierrc.yml @@ -1,5 +1,8 @@ arrowParens: always endOfLine: lf +#Deprecated +# jsxBracketSameLine: true +bracketSameLine: false jsxSingleQuote: false printWidth: 80 proseWrap: preserve @@ -9,3 +12,7 @@ singleQuote: true tabWidth: 2 trailingComma: es5 useTabs: false +# PrettierX config, currently unused +# importFormatting: oneline +# offsetTernaryExpressions: true +# breakLongMethodChains: true diff --git a/tgui/.yarn/releases/yarn-3.3.1.cjs b/tgui/.yarn/releases/yarn-3.3.1.cjs new file mode 100644 index 000000000000..53a282e439a3 --- /dev/null +++ b/tgui/.yarn/releases/yarn-3.3.1.cjs @@ -0,0 +1,823 @@ +#!/usr/bin/env node +/* eslint-disable */ +//prettier-ignore +(()=>{var dfe=Object.create;var jS=Object.defineProperty;var Cfe=Object.getOwnPropertyDescriptor;var mfe=Object.getOwnPropertyNames;var Efe=Object.getPrototypeOf,Ife=Object.prototype.hasOwnProperty;var J=(r=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(r,{get:(e,t)=>(typeof require<"u"?require:e)[t]}):r)(function(r){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+r+'" is not supported')});var y=(r,e)=>()=>(e||r((e={exports:{}}).exports,e),e.exports),ht=(r,e)=>{for(var t in e)jS(r,t,{get:e[t],enumerable:!0})},yfe=(r,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of mfe(e))!Ife.call(r,n)&&n!==t&&jS(r,n,{get:()=>e[n],enumerable:!(i=Cfe(e,n))||i.enumerable});return r};var ne=(r,e,t)=>(t=r!=null?dfe(Efe(r)):{},yfe(e||!r||!r.__esModule?jS(t,"default",{value:r,enumerable:!0}):t,r));var aK=y((uZe,oK)=>{oK.exports=sK;sK.sync=Gfe;var iK=J("fs");function Hfe(r,e){var t=e.pathExt!==void 0?e.pathExt:process.env.PATHEXT;if(!t||(t=t.split(";"),t.indexOf("")!==-1))return!0;for(var i=0;i
You are in {status} condition!
+
+ You are in {status} condition!
+
```
After compiling the code above, this is what it becomes:
```js
-createElement(
- 'div',
+createElement('div',
{ className: 'color-' + status },
- 'You are in ',
- status,
- ' condition!'
-);
+ 'You are in ', status, ' condition!');
```
It is very important to remember, that JSX is just a javascript expression
@@ -214,7 +218,11 @@ to a `